Pullup ticket #4494 - requested by rodent
net/socat: security update

Revisions pulled up:
- net/socat/Makefile                                            1.32
- net/socat/distinfo                                            1.20
- net/socat/patches/patch-aa                                    deleted
- net/socat/patches/patch-configure                             1.2
- net/socat/patches/patch-mytypes.h                             1.2

---
   Module Name:	pkgsrc
   Committed By:	rodent
   Date:		Sun Sep  7 23:24:56 UTC 2014

   Modified Files:
   	pkgsrc/net/socat: Makefile distinfo
   	pkgsrc/net/socat/patches: patch-configure patch-mytypes.h
   Removed Files:
   	pkgsrc/net/socat/patches: patch-aa

   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)
Pullup ticket #4501 - requested by he
www/apache22: security update

Revisions pulled up:
- www/apache22/Makefile                                         1.102
- www/apache22/distinfo                                         1.60

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Tue Sep  9 08:11:48 UTC 2014

   Modified Files:
   	pkgsrc/www/apache22: Makefile distinfo

   Log Message:
   Changes  2.4.10

     *) SECURITY: CVE-2014-0117 (cve.mitre.org)
        mod_proxy: Fix crash in Connection header handling which
        allowed a denial of service attack against a reverse proxy
        with a threaded MPM.

     *) SECURITY: CVE-2014-3523 (cve.mitre.org)
        Fix a memory consumption denial of service in the WinNT MPM (used in all Windows
        installations). Workaround: AcceptFilter <protocol> {none|connect}

     *) SECURITY: CVE-2014-0226 (cve.mitre.org)
        Fix a race condition in scoreboard handling, which could lead to
        a heap buffer overflow.

     *) SECURITY: CVE-2014-0118 (cve.mitre.org)
        mod_deflate: The DEFLATE input filter (inflates request bodies) now
        limits the length and compression ratio of inflated request bodies to avoid
        denial of sevice via highly compressed bodies.  See directives
        DeflateInflateLimitRequestBody, DeflateInflateRatioLimit,
        and DeflateInflateRatioBurst.

     *) SECURITY: CVE-2014-0231 (cve.mitre.org)
        mod_cgid: Fix a denial of service against CGI scripts that do
        not consume stdin that could lead to lingering HTTPD child processes
        filling up the scoreboard and eventually hanging the server.  By
        default, the client I/O timeout (Timeout directive) now applies to
        communication with scripts.  The CGIDScriptTimeout directive can be
        used to set a different timeout for communication with scripts.

     *) mod_ssl: Extend the scope of SSLSessionCacheTimeout to sessions
        resumed by TLS session resumption (RFC 5077).

     *) mod_deflate: Don't fail when flushing inflated data to the user-agent
        and that coincides with the end of stream ("Zlib error flushing inflate
        buffer").

     *) mod_proxy_ajp: Forward local IP address as a custom request attribute
        like we already do for the remote port.

     *) core: Include any error notes set by modules in the canned error
        response for 403 errors.

     *) mod_ssl: Set an error note for requests rejected due to
        SSLStrictSNIVHostCheck.

     *) mod_ssl: Fix issue with redirects to error documents when handling
        SNI errors.

     *) mod_ssl: Fix tmp DH parameter leak, adjust selection to prefer
        larger keys and support up to 8192-bit keys.

     *) mod_dav: Fix improper encoding in PROPFIND responses.

     *) WinNT MPM: Improve error handling for termination events in child.

     *) mod_proxy: When ping/pong is configured for a worker, don't send or
        forward "100 Continue" (interim) response to the client if it does
        not expect one.

     *) mod_ldap: Be more conservative with the last-used time for
        LDAPConnectionPoolTTL.

     *) mod_ldap: LDAP connections used for authn were not respecting
        LDAPConnectionPoolTTL.

     *) mod_proxy_fcgi: Fix occasional high CPU when handling request bodies.

     *) event MPM: Fix possible crashes (third-party modules accessing c->sbh)
        or occasional missed mod_status updates under load.

     *) mod_authnz_ldap: Support primitive LDAP servers do not accept
        filters, such as "SDBM-backed LDAP" on z/OS, by allowing a special
        filter "none" to be specified in AuthLDAPURL.

     *) mod_deflate: Fix inflation of files larger than 4GB.

     *) mod_deflate: Handle Zlib header and validation bytes received in multiple
        chunks.

     *) mod_proxy: Allow reverse-proxy to be set via explicit handler.

     *) ab: support custom HTTP method with -m argument.

     *) mod_proxy_balancer: Correctly encode user provided data in management
        interface.

     *) mod_proxy_fcgi: Support iobuffersize parameter.

     *) mod_auth_form: Add a debug message when the fields on a form are not
        recognised.

     *) mod_cache: Preserve non-cacheable headers forwarded from an origin 304
        response.

     *) mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:"
        scheme.

     *) mod_socache_shmcb: Correct counting of expirations for status display.
        Expirations happening during retrieval were not counted.

     *) mod_cache: Retry unconditional request with the full URL (including the
        query-string) when the origin server's 304 response does not match the
        conditions used to revalidate the stale entry.

     *) mod_alias: Stop setting CONTEXT_PREFIX and CONTEXT_DOCUMENT environment
        variables as a result of AliasMatch.

     *) mod_cache: Don't add cached/revalidated entity headers to a 304 response.

     *) mod_proxy_scgi: Support Unix sockets.  ap_proxy_port_of_scheme():
        Support default SCGI port (4000).

     *) mod_cache: Fix AH00784 errors on Windows when the the CacheLock directive
        is enabled.

     *) mod_expires: don't add Expires header to error responses (4xx/5xx),
        be they generated or forwarded.

     *) mod_proxy_fcgi: Don't segfault when failing to connect to the backend.
        (regression in 2.4.9 release)

     *) mod_authn_socache: Fix crash at startup in certain configurations.

     *) mod_ssl: restore argument structure for "exec"-type SSLPassPhraseDialog
        programs to the form used in releases up to 2.4.7, and emulate
        a backwards-compatible behavior for existing setups.

     *) mod_ssl: Add SSLOCSPUseRequestNonce directive to control whether or not
        OCSP requests should use a nonce to be checked against the responder's
        one.

     *) mod_ssl: "SSLEngine off" will now override a Listen-based default
        and does disable mod_ssl for the vhost.

     *) mod_lua: Enforce the max post size allowed via r:parsebody()

     *) mod_lua: Use binary comparison to find boundaries for multipart
        objects, as to not terminate our search prematurely when hitting
        a NULL byte.

     *) mod_ssl: add workaround for SSLCertificateFile when using OpenSSL
        versions before 0.9.8h and not specifying an SSLCertificateChainFile
        (regression introduced with 2.4.8).

     *) mod_ssl: bring SNI behavior into better conformance with RFC 6066:
        no longer send warning-level unrecognized_name(112) alerts,
        and limit startup warnings to cases where an OpenSSL version
        without TLS extension support is used.

     *) mod_proxy_html: Avoid some possible memory access violation in case of
        specially crafted files, when the ProxyHTMLMeta directive is turned on.

     *) mod_auth_form: Make sure the optional functions are loaded even when
        the AuthFormProvider isn't specified.

     *) mod_ssl: avoid processing bogus SSLCertificateKeyFile values
        (and logging garbled file names).

     *) mod_ssl: fix merging of global and vhost-level settings with the
        SSLCertificateFile, SSLCertificateKeyFile, and SSLOpenSSLConfCmd
        directives.

     *) mod_headers: Allow the "value" parameter of Header and RequestHeader to
        contain an ap_expr expression if prefixed with "expr=".

     *) rotatelogs: Avoid creation of zombie processes when -p is used on
        Unix platforms.

     *) mod_authnz_fcgi: New module to enable FastCGI authorizer
        applications to authenticate and/or authorize clients.

     *) mod_proxy: Do not try to parse the regular expressions passed by
        ProxyPassMatch as URL as they do not follow their syntax.

     *) mod_reqtimeout: Resolve unexpected timeouts on keepalive requests
        under the Event MPM.

     *) mod_proxy_fcgi: Fix sending of response without some HTTP headers
        that might be set by filters.

     *) mod_proxy_html: Do not delete the wrong data from HTML code when a
        "http-equiv" meta tag specifies a Content-Type behind any other
        "http-equiv" meta tag.

     *) mod_proxy: Don't reuse a SSL backend connection whose requested SNI
        differs.

     *) Add suspend_connection and resume_connection hooks to notify modules
        when the thread/connection relationship changes.  (Should be implemented
        for any third-party async MPMs.)

     *) mod_proxy_wstunnel: Don't issue AH02447 and log a 500 on routine
        hangups from websockets origin servers.

     *) mod_proxy_wstunnel: Don't pool backend websockets connections,
        because we need to handshake every time.

     *) mod_lua: Redesign how request record table access behaves,
        in order to utilize the request record from within these tables.

     *) mod_lua: Add r:wspeek for peeking at WebSocket frames.

     *) mod_lua: Log an error when the initial parsing of a Lua file fails.

     *) mod_lua: Reformat and escape script error output.

     *) mod_lua: URL-escape cookie keys/values to prevent tainted cookie data
        from causing response splitting.

     *) mod_lua: Disallow newlines in table values inside the request_rec,
        to prevent HTTP Response Splitting via tainted headers.

     *) mod_lua: Remove the non-working early/late arguments for
        LuaHookCheckUserID.

     *) mod_lua: Change IVM storage to use shm

     *) mod_lua: More verbose error logging when a handler function cannot be
        found.
Pullup tickets #4494 and #4501.