Log message:
*: Move SUBST_STAGE from post-patch to pre-configure

Performing substitutions during post-patch breaks tools such as mkpatches,
making it very difficult to regenerate correct patches after making changes,
and often leading to substituted string replacements being committed.

Log message:
socat: improve our ability to run the tests, less use of /bin/bash

bump PKGREVISION in case any of those scripts are used at runtime

Log message:
Update net/socat to socat-1.7.3.2

pkgsrc changes:
 - Take MAINTAINERship

Changes:
1.7.3.2
-------
corrections:
 - SIGSEGV and other signals could lead to a 100% CPU loop
 - Failing name resolution could lead to SIGSEGV
   Thanks to Max for reporting this issue.
 - Include <stddef.h> for ptrdiff_t
   Thanks to Jeroen Roovers for reporting this issue.
 - Building with --disable-sycls failed due to missing sslcls.h defines
   Socat hung when configured with --disable-sycls.
 - Some minor corrections with includes etc.
 - Option so-reuseport did not work. Thanks to Some Raghavendra Prabhu
   for sending a patch.
 - Programs invoked with EXEC, nofork, and -u or -U had stdin and stdout
   incorrectly assigned
   Test: EXEC_NOFORK_UNIDIR
   Thanks to David Reiss for reporting this problem.
 - Socat exited with status 0 even when a program invoked with SYSTEM or
   EXEC failed.
   Tests: SYSTEM_RC EXEC_RC
   Issue reported by Felix Winkelmann.
 - AddressSanitizer reported a few buffer overflows (false positives).
   Nevertheless fixed Socat source.
   Issue reported by Hanno Böck.
 - Socat did not use option ipv6-join-group.
   Test: USE_IPV6_JOIN_GROUP
   Thanks to Linux Lüssing for sending a patch.
 - UDP-LISTEN did not honor the max-children option.
   Test: UDP4MAXCHILDREN UDP6MAXCHILDREN
   Thanks to Leander Berwers for reporting this issue.
 - Options so-rcvtimeo and so-sndtimeo do not work with poll()/select()
   and therefore were useless.
   Thanks to Steve Borenstein for reporting this issue.
 - Option dhparam was documented as dhparams. Added the alias name
   dhparams to fix this.
   Thanks to Alexander Neumann for sending a patch.
 - Options shut-down and shut-close did not work.
   Thanks to Stefan Schimanski for providing a patch.
 - There was a bug in printing readline log message caused by a misleading
   indentation.
   Thanks to Paul Wouters for reporting.
 - The internal vsnprintf_r function looped or crashed on size parameter
   with hexadecimal output.
 - Ignore exit code of child process when it was killed by master due to
   EOF
 - Corrected byte order on read of IPV6_TCLASS value from ancillary
   message
 - Fixed type of the bool element in options. This had bug caused failures
   e.g. of ignoreeof on big-endian systems when bool was not based on int.
 - On systems with predefined bool type whose size differs from int some
   IPv6 and TCP options (per setsockopt()) failed.
 - Length of integral data in ancillary messages varies (TOS: 1 byte,
   TTL: 4 bytes), the old implementation failed for TTL on big-endian
   hosts.
 - Fixed an issue in options processing: TUN and DNS flags had failed on
   big-endian systems and the NO- forms had probable never worked.

porting:
 - Type conflict between int and sig_atomic_t between declaration and
   definition of diag_immediate_type and diag_immediate_exit broke
   compilation on FreeBSD 10.1 with clang. Thanks to Emanuel Haupt for
   reporting this bug.
 - Socat failed to compile on platforms with OpenSSL without
   DTLSv1_client_method or DTLSv1_server_method.
   Thanks to Simon Matter for sending a patch.
 - NuttX OS headers do not provide struct ip, thus socat did not compile.
   Made struct ip subject to configure.
   Thanks to SP for reporting this issue.
 - Socat failed to compile with OpenSSL version 1.0.2d where
   SSLv3_server_method and SSLv3_client_method are no longer defined.
   Thanks to Mischa ter Smitten for reporting this issue and providing
   a patch.
 - configure checked for OpenSSL EC_KEY assuming it is a define but it
   is a type, thus OpenSSL ECDHE ciphers failed even on Linux.
   Thanks to Andrey Arapov for reporting this bug.
 - Changes to make socat compile with OpenSSL 1.1.
   Thanks to Sebastian Andrzej Siewior e.a. from the Debian team for
   providing the base patch.
   Debian Bug#828550
 - Make Socat compatible with BoringSSL.
   Thanks to Matt Braithwaite for providing a patch.
 - OpenSSL: Use RAND_status to determine PRNG state
   Thanks to Adam Langley for providing a patch
 - AIX-7 uses an extended O_ACCMODE that does not fit socat's internal
   requirements. Thanks to Garrick Trowsdale for providing a patch
 - LibreSSL support: check for OPENSSL_NO_COMP
   Thanks to Bernard Spil for providing a patch

testing:
 - socks4echo.sh and socks4a-echo.sh hung with new bash with read -n
 - test.sh: stderr; option -v (verbose); FDOUT_ERROR description
 - improved proxy.sh - it now also takes hostnames
 - A few corrections in test.sh
 - DTLS1 test hangs on some distributions. Test is now only performed
   with OpenSSL 1.0.2 or higher.
 - More corrections to test.sh that reveal a mistake with IPV6_TCLASS

docu:
 - Corrected source of socat man page to correctly show man references
   like socket(2); removed obseolete entries from See Also
 - Docu and some comments mentioned addresses SSL-LISTEN and SSL-CONNECT
   that do not exist (OPENSSL-LISTEN, SSL-L; and OPENNSSL-CONNECT, SSL
   are correct).
   Thanks to Zhigang Wang for reporting this issue.
 - Fixed a couple of English spelling and grammar mistakes.
   Thanks to Jakub Wild for sending the patches.
 - NOEXPAND() was not resolved 2 times.
 - More minor docu corrections

legal:
 - Added contributors to copyright notices. Suggested by Matt Braithwaite.

Log message:
Bump PKGREVISION for security/openssl ABI bump.

Log message:
Update net/socat to 1.7.3.1.

Changes:
####################### V 1.7.3.1:
security:
  Socat security advisory 8
  A stack overflow in vulnerability was found that can be triggered when
  command line arguments (complete address specifications, host names,
  file names) are longer than 512 bytes.
  Successful exploitation might allow an attacker to execute arbitrary
  code with the privileges of the socat process.
  This vulnerability can only be exploited when an attacker is able to
  inject data into socat's command line.
  A vulnerable scenario would be a CGI script that reads data from clients
  and uses (parts of) this data as hostname for a Socat invocation.
  Test: NESTEDOVFL
  Credits to Takumi Akiyama for finding and reporting this issue.

  Socat security advisory 7
  MSVR-1499
  In the OpenSSL address implementation the hard coded 1024 bit DH p
  parameter was not prime. The effective cryptographic strength of a key
  exchange using these parameters was weaker than the one one could get by
  using a prime p. Moreover, since there is no indication of how these
  parameters were chosen, the existence of a trapdoor that makes possible
  for an eavesdropper to recover the shared secret from a key exchange
  that uses them cannot be ruled out.
  Futhermore, 1024bit is not considered sufficiently secure.
  Fix: generated a new 2048bit prime.
  Thanks to Santiago Zanella-Beguelin and Microsoft Vulnerability
  Research (MSVR) for finding and reporting this issue.

Log message:
Add SHA512 digests for distfiles for net category

Problems found with existing digests:
	Package haproxy distfile haproxy-1.5.14.tar.gz
	159f5beb8fdc6b8059ae51b53dc935d91c0fb51f [recorded]
	da39a3ee5e6b4b0d3255bfef95601890afd80709 [calculated]

Problems found locating distfiles:
	Package bsddip: missing distfile bsddip-1.02.tar.Z
	Package citrix_ica: missing distfile citrix_ica-10.6.115659/en.linuxx86.tar.gz
	Package djbdns: missing distfile djbdns-1.05-test25.diff.bz2
	Package djbdns: missing distfile djbdns-cachestats.patch
	Package djbdns: missing distfile 0002-dnscache-cache-soa-records.patch
	Package gated: missing distfile gated-3-5-11.tar.gz
	Package owncloudclient: missing distfile owncloudclient-2.0.2.tar.xz
	Package poink: missing distfile poink-1.6.tar.gz
	Package ra-rtsp-proxy: missing distfile rtspd-src-1.0.0.0.tar.gz
	Package ucspi-ssl: missing distfile ucspi-ssl-0.70-ucspitls-0.1.patch
	Package waste: missing distfile waste-source.tar.gz

Otherwise, existing SHA1 digests verified and found to be the same on
the machine holding the existing distfiles (morden).  All existing
SHA1 digests retained for now as an audit trail.

Log message:
Update socat to 1.7.3.0. From Ben Gergely in PR pkg/49996.

####################### V 1.7.3.0:

security:
	(CVE Id pending)
	Fixed problems with signal handling caused by use of not async signal
	safe functions in signal handlers that could freeze socat, allowing
	denial of service attacks.
	Many changes in signal handling and the diagnostic messages system were
	applied to make the code async signal safe but still provide detailled
	logging from signal handlers:
	Coded function vsnprintf_r() as async signal safe incomplete substitute
	of libc vsnprintf()
	Coded function snprinterr() to replace %m in strings with a system error
	message
	Instead of gettimeofday() use clock_gettime() when available
	Pass Diagnostic messages from signal handler per unix socket to the main
	program flow
	Use sigaction() instead of signal() for better control
	Turn off nested signal handler invocations
	Thanks to Peter Lobsinger for reporting and explaining this issue.

	Red Hat issue 1019975: add TLS host name checks
	OpenSSL client checks if the server certificates names in
	extensions/subjectAltName/DNS or in subject/commonName match the name
	used to connect or the value of the openssl-commonname option.
	Test: OPENSSL_CN_CLIENT_SECURITY

	OpenSSL server checks if the client certificates names in
	extensions/subjectAltNames/DNS or subject/commonName match the value of
	the openssl-commonname option when it is used.
	Test: OPENSSL_CN_SERVER_SECURITY

	Red Hat issue 1019964: socat now uses the system certificate store with
	OPENSSL when neither options cafile nor capath are used

	Red Hat issue 1019972: needs to specify OpenSSL cipher suites
	Default cipherlist is now "HIGH:-NULL:-PSK:-aNULL" instead of empty to
	prevent downgrade attacks

new features:
	OpenSSL addresses set couple of environment variables from values in
	peer certificate, e.g.:
	SOCAT_OPENSSL_X509_SUBJECT, SOCAT_OPENSSL_X509_ISSUER,
	SOCAT_OPENSSL_X509_COMMONNAME,
	SOCAT_OPENSSL_X509V3_SUBJECTALTNAME_DNS
	Tests: ENV_OPENSSL_{CLIENT,SERVER}_X509_*

	Added support for methods TLSv1, TLSv1.1, TLSv1.2, and DTLS1
	Tests: OPENSSL_METHOD_*

	Enabled OpenSSL server side use of ECDHE ciphers. Feature suggested
	by Andrey Arapov.

	Added a new option termios-rawer for ptys.
	Thanks to Christian Vogelgsang for pointing me to this requirement

corrections:
	Bind with ABSTRACT commands used non-abstract namespace (Linux).
	Test: ABSTRACT_BIND
	Thanks to Denis Shatov for reporting this bug.

	Fixed return value of nestlex()

	Option ignoreeof on the right address hung.
	Test: IGNOREEOF_REV
	Thanks to Franz Fasching for reporting this bug.

	Address SYSTEM, when terminating, shut down its parent addresses,
	e.g. an SSL connection which the parent assumed to still be active.
	Test: SYSTEM_SHUTDOWN

	Passive (listening or receiving) addresses with empty port field bound
	to a random port instead of terminating with error.
	Test: TCP4_NOPORT

	configure with some combination of disable options produced config
	files that failed to compile due to missing IPPROTO_TCP.
	Thanks to Thierry Fournier for report and patch.

	fixed a few minor bugs with OpenSSL in configure and with messages

	Socat did not work in FIPS mode because 1024 instead of 512 bit DH prime
	is required. Thanks to Zhigang Wang for reporting and sending a patch.

	Christophe Leroy provided a patch that fixes memory leaks reported by
	valgrind

	Help for filan -L was bad, is now corrected to:
	"follow symbolic links instead of showing their properties"

	Address options fdin and fdout were silently ignored when not applicable
	due to -u or -U option. Now these combinations are caught as errors.
	Test: FDOUT_ERROR
	Issue reported by Hendrik.

	Added option termios-cfmakeraw that calls cfmakeraw() and is preferred
	over option raw which is now obsolote. On SysV systems this call is
	simulated by appropriate setting.
	Thanks to Youfu Zhang for reporting issue with option raw.

porting:
	Socat included <sys/poll.h> instead of POSIX <poll.h>
	Thanks to John Spencer for reporting this issue.

	Version 1.7.2.4 changed the check for gcc in configure.ac; this
	broke cross compiling. The particular check gets reverted.
	Thanks to Ross Burton and Danomi Manchego for reporting this issue.

	Debian Bug#764251: Set the build timestamp to a deterministic time:
	support external BUILD_DATE env var to allow to build reproducable
	binaries

	Joachim Fenkes provided an new adapted spec file.

	Type bool and macros Min and Max are defined by socat which led to
	compile errors when they were already provided by build framework.
	Thanks to Liyu Liu for providing a patch.

	David Arnstein contributed a patch for NetBSD 5.1 including stdbool.h
	support and appropriate files in Config/

	Lauri Tirkkonen contributed a patch regarding netinet/if_ether.h
	on Illumos

	Changes for Openindiana: define _XPG4_2, __EXTENSIONS__,
	_POSIX_PTHREAD_SEMANTICS; and minor changes

	Red Hat issue 1182005: socat 1.7.2.4 build failure missing
	linux/errqueue.h
	Socat failed to compile on on PPC due to new requirements for
	including <linux/errqueue.h> and a weakness in the conditional code.
	Thanks to Michel Normand for reporting this issue.

doc:
	In the man page the PTY example was badly formatted. Thanks to
	J.F.Sebastian for sending a patch.

	Added missing CVE ids to security issues in CHANGES

testing:
	Do not distribute testcert.conf with socat source but generate it
	(and new testcert6.conf) during test.sh run.

####################### V 1.7.2.4:

corrections:
	LISTEN based addresses applied some address options, e.g. so-keepalive,
	to the listening file descriptor instead of the connected file
	descriptor
	Thanks to Ulises Alonso for reporting this bug

	make failed after configure with non gcc compiler due to missing
	include. Thanks to Horacio Mijail for reporting this problem

	configure checked for --disable-rawsocket but printed
	--disable-genericsocket in the help text. Thanks to Ben Gardiner for
	reporting and patching this bug

	In xioshutdown() a wrong branch was chosen after RECVFROM type addresses.
	Probably no impact.
	Thanks to David Binderman for reproting this issue.

	procan could not cleanly format ulimit values longer than 16 decimal
	digits. Thanks to Frank Dana for providing a patch that increases field
	width to 24 digits.

	OPENSSL-CONNECT with bind option failed on some systems, eg.FreeBSD, with
	"Invalid argument"
	Thanks to Emile den Tex for reporting this bug.

	Changed some variable definitions to make gcc -O2 aliasing checker happy
	Thanks to Ilya Gordeev for reporting these warnings

	On big endian platforms with type long >32bit the range option applied a
	bad base address. Thanks to hejia hejia for reporting and fixing this bug.

	Red Hat issue 1022070: missing length check in xiolog_ancillary_socket()

	Red Hat issue 1022063: out-of-range shifts on net mask bits

	Red Hat issue 1022062: strcpy misuse in xiosetsockaddrenv_ip4()

	Red Hat issue 1022048: strncpy hardening: corrected suspicious strncpy()
	uses

	Red Hat issue 1021958: fixed a bug with faulty buffer/data length
	calculation in xio-ascii.c:_xiodump()

	Red Hat issue 1021972: fixed a missing NUL termination in return string
	of sysutils.c:sockaddr_info() for the AF_UNIX case

	fixed some typos and minor issues, including:
	Red Hat issue 1021967: formatting error in manual page

	UNIX-LISTEN with fork option did not remove the socket file system entry
	when exiting. Other file system based passive address types had similar
	issues or failed to apply options umask, user e.a.
	Thanks to Lorenzo Monti for pointing me to this issue

porting:
	Red Hat issue 1020203: configure checks fail with some compilers.
	Use case: clang

	Performed changes for Fedora release 19

	Adapted, improved test.sh script

	Red Hat issue 1021429: getgroupent fails with large number of groups;
	use getgrouplist() when available instead of sequence of calls to
	getgrent()

	Red Hat issue 1021948: snprintf API change;
	Implemented xio_snprintf() function as wrapper that tries to emulate C99
	behaviour on old glibc systems, and adapted all affected calls
	appropriately

	Mike Frysinger provided a patch that supports long long for time_t,
	socklen_t and a few other libc types.

	Artem Mygaiev extended Cedril Priscals Android build script with pty code

	The check for fips.h required stddef.h
	Thanks to Matt Hilt for reporting this issue and sending a patch

	Check for linux/errqueue.h failed on some systems due to lack of
	linux/types.h inclusion. Thanks to Michael Vastola for sending a patch.

	autoconf now prefers configure.ac over configure.in
	Thanks to Michael Vastola for sending a patch.

	type of struct cmsghdr.cmsg is system dependend, determine it with
	configure; some more print format corrections

docu:
	libwrap always logs to syslog

	added actual text version of GPLv2

Log message:
Drop ONLY_FOR_COMPILER. If -Werror is no good reason for such a mask and
should be handled if desired.

Log message:
Add clang to ONLY_FOR_COMPILER per PR 49852 from Alexander Borkowski.

(XXX: shouldn't the wrappers be taking care of -Werror for compilers
that don't understand it?)

Log message:
Update to latest stable, 1.7.2.4, which is supposed to resolve CVE-2014-0019.
patches/patch-aa seems to have been committed upstream. Passing readline
location to configure and fixing CCOPTS in Makefile.in seems to not be
necessary anymore. From CHANGES:

####################### V 1.7.2.4:

corrections:
	LISTEN based addresses applied some address options, e.g. so-keepalive,
	to the listening file descriptor instead of the connected file
	descriptor

	make failed after configure with non gcc compiler due to missing
	include.

	configure checked for --disable-rawsocket but printed
	--disable-genericsocket in the help text.

	In xioshutdown() a wrong branch was chosen after RECVFROM type addresses.
	Probably no impact.

	procan could not cleanly format ulimit values longer than 16 decimal
	digits. Thanks to Frank Dana for providing a patch that increases field
	width to 24 digits.

	OPENSSL-CONNECT with bind option failed on some systems, eg.FreeBSD, with
	"Invalid argument"

	Changed some variable definitions to make gcc -O2 aliasing checker happy

	On big endian platforms with type long >32bit the range option applied a
	bad base address.

	Red Hat issue 1022070: missing length check in xiolog_ancillary_socket()

	Red Hat issue 1022063: out-of-range shifts on net mask bits

	Red Hat issue 1022062: strcpy misuse in xiosetsockaddrenv_ip4()

	Red Hat issue 1022048: strncpy hardening: corrected suspicious strncpy()
	uses

	Red Hat issue 1021958: fixed a bug with faulty buffer/data length
	calculation in xio-ascii.c:_xiodump()

	Red Hat issue 1021972: fixed a missing NUL termination in return string
	of sysutils.c:sockaddr_info() for the AF_UNIX case

	fixed some typos and minor issues, including:
	Red Hat issue 1021967: formatting error in manual page

	UNIX-LISTEN with fork option did not remove the socket file system entry
	when exiting. Other file system based passive address types had similar
	issues or failed to apply options umask, user e.a.

porting:
	Red Hat issue 1020203: configure checks fail with some compilers.
	Use case: clang

	Performed changes for Fedora release 19

	Adapted, improved test.sh script

	Red Hat issue 1021429: getgroupent fails with large number of groups;
	use getgrouplist() when available instead of sequence of calls to
	getgrent()

	Red Hat issue 1021948: snprintf API change;
	Implemented xio_snprintf() function as wrapper that tries to emulate C99
	behaviour on old glibc systems, and adapted all affected calls
	appropriately

	Mike Frysinger provided a patch that supports long long for time_t,
	socklen_t and a few other libc types.

	Artem Mygaiev extended Cedril Priscals Android build script with pty code

	The check for fips.h required stddef.h

	Check for linux/errqueue.h failed on some systems due to lack of
	linux/types.h inclusion.

	autoconf now prefers configure.ac over configure.in

	type of struct cmsghdr.cmsg is system dependend, determine it with
	configure; some more print format corrections

docu:
	libwrap always logs to syslog

	added actual text version of GPLv2

####################### V 1.7.2.3:

security:
	CVE-2014-0019: socats PROXY-CONNECT address was vulnerable to a buffer
	overflow with data from command line (see socat-secadv5.txt)