aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Moone <gentoo@chaoslab.org>2018-12-09 16:57:41 +0000
committerAnthony G. Basile <blueness@gentoo.org>2018-12-09 14:27:36 -0500
commit8afb86b27341a67198483dbf061cd6720522dad1 (patch)
treeee7da1c78a91a9798c5b75ed0d4980357f310e5c
parentnet-misc/openssh: Drop 7.6_p1-r5 (diff)
downloadlibressl-8afb86b27341a67198483dbf061cd6720522dad1.tar.gz
libressl-8afb86b27341a67198483dbf061cd6720522dad1.tar.bz2
libressl-8afb86b27341a67198483dbf061cd6720522dad1.zip
Drop net-misc/socat
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--net-misc/socat/Manifest1
-rw-r--r--net-misc/socat/files/0001-remove-openssl-comp.patch1140
-rw-r--r--net-misc/socat/files/socat-1.7.3.0-filan-build.patch30
-rw-r--r--net-misc/socat/files/socat-1.7.3.1-no-ssl3.patch70
-rw-r--r--net-misc/socat/files/socat-1.7.3.1-stddef_h.patch38
-rw-r--r--net-misc/socat/metadata.xml8
-rw-r--r--net-misc/socat/socat-1.7.3.1.ebuild60
7 files changed, 0 insertions, 1347 deletions
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
deleted file mode 100644
index 68a8b81..0000000
--- a/net-misc/socat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST socat-1.7.3.1.tar.bz2 488467 SHA256 d2da659540c38139f388e9437bfaae16bb458d174d056cb3228432a8f489fbaa SHA512 463340f578d4d1d54458b8ef9573ad3eff51dbcc736205e1b62e9a4782770d4bb76e6a07506350fd35405b130660559aaa79dfa2664c53ea268d7d64231f9b32 WHIRLPOOL 09f0fc537eaad194cac97cce73971c9f69047c648f03788fa69ac3444673ff73f143b2657d0ed28d082e2cfc36829304ed7bf0ff79c7ed75e96c991292f94dd4
diff --git a/net-misc/socat/files/0001-remove-openssl-comp.patch b/net-misc/socat/files/0001-remove-openssl-comp.patch
deleted file mode 100644
index fe3550a..0000000
--- a/net-misc/socat/files/0001-remove-openssl-comp.patch
+++ /dev/null
@@ -1,1140 +0,0 @@
-diff -ru socat-1.7.3.0/doc/xio.help socat-1.7.3.0.new/doc/xio.help
---- socat-1.7.3.0/doc/xio.help 2013-06-23 14:16:48.000000000 +0800
-+++ socat-1.7.3.0.new/doc/xio.help 2015-11-18 10:56:02.408674607 +0800
-@@ -123,7 +123,7 @@
- It always works on stdin and stdout; if stdio is not a tty, readline does not
- seem to work correctly.
- Because readline is blocking during line editing, it does not fit well into
--socats I/O philosophy.
-+socats I/O philosophy.
- socat integrates readline by waiting in the select call as usual; when stdin
- reports available data, socat invokes readline(). readline blocks until the
- user presses ENTER or EOF. Data on socats other stream is not handling in this
-@@ -144,7 +144,7 @@
- with this name already exists it is opened. Open for reading and/or writing
- depends on the rw parameter of the xioopen call, or on usage in a socat
- argument. If no perm option is used, xioopen uses 600 (which might be modified
--by umask then).
-+by umask then).
- Applying this function to files conforms to the semantics as described by the
- open(2) man page.
- Opening device files, like /dev/ttyS*, might block until the device gets active
-@@ -157,9 +157,9 @@
- Opening the pipe in write mode blocks until a reader opens the pipe (close
- by reader gives "broken pipe" error on next write); with option nonblock the
- open call terminates with error "no such device or address" in absence of a
--reader.
-+reader.
- Opening a named UNIX stream socket with or without a listening peer might
--succeed depending on the operating system, but
-+succeed depending on the operating system, but
- the resulting file descriptor erronously reports available data immediately,
- and the following read() or write() call always fails with "invalid
- argument". Even worse, while such a filesystem entry is identified as socket by
-@@ -206,7 +206,7 @@
- FIFO:path
-
- Creates and opens a pipe if path does not exist; opens path if it already
--exists.
-+exists.
- Option groups: FD, NAMED, FIFO
- Note: this address uses the mknod(2) system call to create the named pipe. On
- FreeBSD, this call requires root privilege
-@@ -246,7 +246,7 @@
- Connects to a UNIX domain socket.
- Option groups: FD, SOCKET, SOCK_UNIX
- NOTE: you need rw permissions to connect to a local socket. My Linux answers
--with "connection refused" to insufficient permissions, not existing
-+with "connection refused" to insufficient permissions, not existing
- socket, not a socket, or just a socket entry without a listening process.
- NOTE: this address does not implement option group NAMED because its connect
- call succeeds only if there is already someone listening, but at this point the
-@@ -268,7 +268,7 @@
- Open a raw socket with IP4 protocol. This mode sends packets to and accepts
- them only from host. protocol is a number from 0 to 255, with 1 meaning ICMP,
- 6..TCP, 17..UDP, 255..raw IP; 0 might be unsupported by the local IP stack,
--resulting in an error.
-+resulting in an error.
- Requires root privilege.
- Note: my Linux 2.4.10 kernel seems to drop payloads smaller than 8
- bytes on their way from the network to the application.
-@@ -281,7 +281,7 @@
-
- Create a TCP/IP4 client socket and connect to the given host/port combination.
- Option groups: FD, SOCKET, SOCK_IP, IPAPP, IP_TCP
--Useful options: crlf, bind, tos, mtudiscover, mss, nodelay,
-+Useful options: crlf, bind, tos, mtudiscover, mss, nodelay,
-
-
- TCP-l:port
-@@ -367,7 +367,7 @@
- Use a socks server, socks protocol version 4, to build a TCP (IPv4) connection.
- Sockd is the name or address of the socks server, host and port specify the
- destination address. Use option socksport if the socks server does not listen
--on port 1080.
-+on port 1080.
- Option groups: FD, SOCKET, SOCK_IP, IPAPP, IP_TCP, IP_SOCKS
- Useful options: sp, socksport, socksuser
- Note: If you do not specify option socksuser, xioopen tries to derive it from
-@@ -425,7 +425,7 @@
-
- Each option is member of one option group. Address definitions specify which
- option groups they support. This allows to reject unapplyable options in an
--early stage of address processing.
-+early stage of address processing.
-
- Address groups are identified by single bit positions. Option definitions
- specify to which group the option belongs (some options are member or more than
-@@ -438,14 +438,14 @@
- options are typically applied with fcntl() or some special calls like fchown()
- or fchmod(). There is no documented restriction to apply these functions to any
- file descriptor; but they are not always meaningful, and sometimes lead to OS
--exceptions.
-+exceptions.
-
- GROUP_APPL: All addresses. The options do not need file descriptors, because
- they manipulate the data streams at application level (ignoreeof, line
- terminator conversion).
-
- GROUP_PROCESS: For options that change process related attributes, like user id
--(setuid).
-+(setuid).
-
- GROUP_FIFO: Options for pipes. Currently not used.
-
-@@ -524,7 +524,7 @@
- Note:
- "Type" describes the type of data that may or must be given to the option and
- that is passed to the system. There are some options with boolean semantics
--(on/off or yes/no), but their values are passed to the system with an int
-+(on/off or yes/no), but their values are passed to the system with an int
- parameter. This situation is indicated as "Logical type: bool" and "Physical
- type: int". In this case xioopen passes the physical value to the system,
- giving the user one more hacking playground.
-@@ -540,7 +540,7 @@
- Sets the O_APPEND flag via a fcntl() call and F_SETFL; with OPEN type
- addresses, this flag is applied with the open() call. All data written is
- appended to the actual file end, even if other processes have written to or
--truncated the file in the meantime.
-+truncated the file in the meantime.
-
-
- Option: async
-@@ -552,7 +552,7 @@
-
- Sets the O_ASYNC (or FASYNC) flag via a fcntl() call and F_SETFL; with FILE
- addresses, this flag is applied with the open() call. Consult your kernel
--documentation for effects of this flag.
-+documentation for effects of this flag.
- NOTE: socat does not handle the SIGIO signal.
-
-
-@@ -595,7 +595,7 @@
-
- Applies the flock(fd, LOCK_EX|LOCK_NB) call to the file descriptor(s). This locks a file
- exclusively (but only for processes also using flock() on this file -
--otherwise, they seem to have unrestricted access).
-+otherwise, they seem to have unrestricted access).
- If the file is already locked with flock, our flock call returns the error
- "Resource temporarily unavailable".
-
-@@ -607,10 +607,10 @@
- Phase: FD
- Platforms: FreeBSD, Linux
-
--Applies a shared advisory lock to the file using the flock(fd, LOCK_SH) call.
-+Applies a shared advisory lock to the file using the flock(fd, LOCK_SH) call.
- This prevents processes from locking the file exclusively.
- If the file has already an exclusive lock, our flock call blocks until the
--other processes lock is released.
-+other processes lock is released.
-
-
- Option: flock-sh-nb
-@@ -620,7 +620,7 @@
- Phase: FD
- Platforms: FreeBSD, Linux
-
--Applies a shared advisory lock to the file using the flock(fd, LOCK_SH|LOCK_NB) call.
-+Applies a shared advisory lock to the file using the flock(fd, LOCK_SH|LOCK_NB) call.
- This prevents processes from locking the file exclusively.
- If the file has already an exclusive lock, our flock call returns with error
- "Resource temporarily unavailable".
-@@ -716,7 +716,7 @@
-
- Takes one argument, a UNIX group name or a numeric group id. The first
- character of value is a digit for group ids.
--With NAMED addresses this option is applied via a chown() call, with a
-+With NAMED addresses this option is applied via a chown() call, with a
- fchown() call otherwise.
- If groupname is a name it must be a valid groupname from /etc/group and is
- converted to a group id with a getgrnam(3) call.
-@@ -847,7 +847,7 @@
- Platforms: HP-UX, Linux, SunOS
-
- Positions the file at the given offset from the current position,
--using lseek() (or lseek64() if available) with SEEK_SET.
-+using lseek() (or lseek64() if available) with SEEK_SET.
-
-
- Option: seek-end=offset
-@@ -886,7 +886,7 @@
- with SEEK_CUR. This call
- might fail for non random access data objects like character devices.
- On Linux, the seek() call fails on pipes, sockets and ttys but works on files
--and /dev/null
-+and /dev/null
- NOTE: this option seems to be useless on files with O_APPEND set.
-
-
-@@ -951,8 +951,8 @@
- Platforms: all
-
- Invokes the chroot() system call with the given path after the address
--resolution, so the path names of the address must be specified with absolute
--pathes.
-+resolution, so the path names of the address must be specified with absolute
-+pathes.
- Note: when you combine chroot with substuser, with substuser applied within the
- chroot environment, usually the etc/passwd and etc/group files in the chroot
- environment are used for group set etc.
-@@ -1153,7 +1153,7 @@
- the file descriptors. This is useful when the connection is to be reused by
- or shared with other processes.
- Normally, socket connections will be ended with shutdown(2) which
-- terminates the socket even if it is shared by multiple processes.
-+ terminates the socket even if it is shared by multiple processes.
- close(2) "unlinks" the socket from the process but keeps it active as
- long as there are still links from other processes.
- Similarly, when an address of type EXEC or SYSTEM is ended, socat usually
-@@ -1195,7 +1195,7 @@
- Takes one argument, a UNIX user name or a numeric user id. The first
- character of value is a digit for user ids.
- This option is applied via a fchown() call just before xioopen_single()
--terminates.
-+terminates.
- If username is a name it must be a valid username from /etc/passwd and is
- converted to a user id with a getpwnam() call.
- On sane operating systems, the owner of the process must be root to change
-@@ -1219,7 +1219,7 @@
- Phase: OPEN
- Platforms: all
-
--Use O_RDONLY with the open() call instead of the position dependend default.
-+Use O_RDONLY with the open() call instead of the position dependend default.
- Take care not to block later write operations.
-
-
-@@ -1231,7 +1231,7 @@
- Phase: OPEN
- Platforms: all
-
--Use O_WRONLY with the open() call instead of the position dependend default.
-+Use O_WRONLY with the open() call instead of the position dependend default.
- Take care not to block later write operations.
-
-
-@@ -1243,7 +1243,7 @@
- Phase: OPEN
- Platforms: all
-
--Use O_RDWR with the open() call instead of the position dependend default.
-+Use O_RDWR with the open() call instead of the position dependend default.
-
-
- Option: o-create
-@@ -1463,7 +1463,7 @@
- Phase: PASTOPEN
- Platforms: all
-
--This option tries to remove the filesystem entry after it has been opened.
-+This option tries to remove the filesystem entry after it has been opened.
- Options can still be applied to the file descriptor, and
- the node or files data can be used, but it can no longer be accessed by other
- processes (except by tricks?), and after closing the stream the data or node is
-@@ -1579,7 +1579,7 @@
- * the first socat address cannot be OPENSSL or READLINE
- * socat options -b, -t, -D, -l, -v, -x, -t become useless
- * for both addresses, options ignoreeof, cr and crnl become useless
-- * for the second address (the one with option nofork), options
-+ * for the second address (the one with option nofork), options
- append, async, cloexec, flock, user, group, mode, nonblock,
- perm-late, setlk, and setpgid cannot be applied, and should be used on the
- first address instead.
-@@ -1605,7 +1605,7 @@
-
- For communication between the exec() or system() subprocess with socat, use a
- pseudo terminal instead of a socket pair. The executed program gets the slave
--side, and socat the controlling side of the pseudo terminal.
-+side, and socat the controlling side of the pseudo terminal.
- This is especially useful if you want to use, e.g., chat with socat (see
- EXAMPLES). Plus, ptys do not buffer I/O.
- Note: implementation of pseudo terminals are differing between platforms, so
-@@ -1742,7 +1742,7 @@
- Platforms: FreeBSD, Linux
-
- Like pty, but only use the openpty mechanism, not any other way for pty
--generation.
-+generation.
-
-
- Option: ptmx
-@@ -1753,7 +1753,7 @@
- Platforms: HP-UX, Linux, SunOS
-
- Like pty, but only use the /dev/ptmx (/dev/ptc on AIX) mechanism, not any other
--way for pty generation.
-+way for pty generation.
-
-
- Option: symbolic-link=filename
-@@ -1782,11 +1782,11 @@
- Usually, socat continues after generating the pty with opening the next
- address or with entering the transfer engine. With the wait-slave option,
- socat waits until some process opens the slave side of the pty before
-- continuing.
-+ continuing.
- This option only works if the operating system provides the tt(poll())
- system call. And it depends on an undocumented behaviour of pty's, so it
- does not work on all operating systems. It has successfully been tested on
-- Linux, FreeBSD, NetBSD, and on Tru64 with openpty.
-+ Linux, FreeBSD, NetBSD, and on Tru64 with openpty.
-
-
- Option: pty-interval
-@@ -1798,7 +1798,7 @@
-
- When the wait-slave option is set, socat periodically checks the HUP
- condition using poll() to find if the pty's slave side has been
-- opened. The default
-+ opened. The default
- polling interval is 1s. Use the pty-interval option to change this value.
-
-
-@@ -1984,8 +1984,8 @@
- Platforms: all
-
- Set the sockettype argument of the socket() or socketpair() call. This
--overrides the per
--protocol default (e.g., TCP: SOCK_STREAM). Most values might
-+overrides the per
-+protocol default (e.g., TCP: SOCK_STREAM). Most values might
- not be supported by a given protocol.
- The following combinations are known to work at least under one OS:
- TCP SOCK_STREAM (system default)
-@@ -2282,7 +2282,7 @@
- Phase: PASTSOCKET
- Platforms: SunOS
-
--Sets the SO_DGRAM_ERRIND flag.
-+Sets the SO_DGRAM_ERRIND flag.
-
-
- Option: so-dontlinger
-@@ -2316,7 +2316,7 @@
-
- Sets the type of the socket, usually as argument to the socket() or
- socketpair() call, to <type>. Under Linux, 1 means stream oriented socket, 2
--means datagram socket, and 3 means raw socket.
-+means datagram socket, and 3 means raw socket.
-
-
- Option: protocol-family
-@@ -2430,10 +2430,10 @@
-
- Uses the rules introduced by Wietse Venema's libwrap (tcpd) library to check
- if the client is allowed to connect. The configuration files are
--/etc/hosts.allow and /etc/hosts.deny. See "man 5 hosts_access" for
-+/etc/hosts.allow and /etc/hosts.deny. See "man 5 hosts_access" for
- more information. <name> is passed to the wrapper functions as daemon
- process name. If omitted, the basename of socats invokation (argv[0]) is
--passed.
-+passed.
- If both tcpwrap and and range options are applied to an address, both
- conditions must be fulfilled to allow the connection.
-
-@@ -2541,7 +2541,7 @@
- Platforms: all
- Implementation status: No results.
-
--Set the IP_RECVTTL socket option.
-+Set the IP_RECVTTL socket option.
-
-
- Option: ip-recvopts
-@@ -2554,7 +2554,7 @@
- Platforms: all
- Implementation status: No results.
-
--Set the IP_RECVOPTS socket option.
-+Set the IP_RECVOPTS socket option.
-
-
- Option: ip-retopts
-@@ -2567,7 +2567,7 @@
- Platforms: all
- Implementation status: No results.
-
--Set the IP_RETOPTS socket option.
-+Set the IP_RETOPTS socket option.
-
-
- Option: ip-tos=value
-@@ -2620,7 +2620,7 @@
- Phase: PASTSOCKET
- Platforms: Linux
-
--Set the IP_RECVERR socket option.
-+Set the IP_RECVERR socket option.
- Implementation status: No results.
-
-
-@@ -2883,7 +2883,7 @@
-
- For outgoing (client) TCP and UDP connections, it sets the source port (local port, client side port) of
- the socket connection. For server type addresses, requires the client to use
--this sourceport, otherwise socat immediately shuts down the connection.
-+this sourceport, otherwise socat immediately shuts down the connection.
- On UNIX class operating systems root privilege are required to set a source
- port between 1 and 1023 incl. 0 gives a "random" port number >= 1024, which is
- the default.
-@@ -3033,7 +3033,7 @@
- Platforms: Linux
-
- Sets the TCP_SYNCNT value of the socket with setsockopt(). Number of SYN
--retransmits.
-+retransmits.
-
-
- Option: tcp-linger2
-@@ -3265,7 +3265,7 @@
- Platforms: all
-
- The HTTP protocol requires the use of CR+NL as line terminator. When a proxy
--server violates this standard, socat might not understand its answer.
-+server violates this standard, socat might not understand its answer.
- This option directs socat to interprete NL as line terminator and
- to ignore CR in the answer. Nevertheless, socat sends CR+NL to the proxy.
-
-@@ -3313,7 +3313,7 @@
- Phase: FD
- Platforms: all
-
--Is equivalent to
-+Is equivalent to
- ignbrk=0,brkint=0,ignpar=0,parmrk=0,inpck=0,istrip=0,inlcr=0,igncr=0,icrnl=0,ixon=0,ixoff=0,iuclc=0,ixany=0,imaxbel=0,opost=0,isig=0,icanon=0,xcase=0,vmin=1,vtime=0
-
-
-@@ -4182,7 +4182,7 @@
- Platforms: all
- Status: tested
-
--Sets the value for the VQUIT character that quits the current process.
-+Sets the value for the VQUIT character that quits the current process.
- On my Linux 2.2 system the preset value is 0x1c (^\).
-
-
-@@ -4426,11 +4426,11 @@
- Phase: LATE
- Platforms: all
-
--Since version 1.3.3, socat per default tries to determine a prompt -
-+Since version 1.3.3, socat per default tries to determine a prompt -
- that is then passed to the readline call - by remembering the last
- incomplete line of the output. With this option, socat does not pass a
- prompt to the readline call, so it might set the cursor to the first column
--of the terminal.
-+of the terminal.
-
-
- Option: noecho
-@@ -4442,7 +4442,7 @@
-
- Specifies a regular pattern for a prompt that prevents the following input
- line from being displayed on the screen and from being added to the history.
--The prompt is defined as the text that was output to the readline address
-+The prompt is defined as the text that was output to the readline address
- after the lastest newline character and before an input character was
- typed. The pattern is a regular expression, e.g.
- "^[Pp]assword:.*$" or "([Uu]ser:|[Pp]assword:)". See regex(7) for details.
-@@ -4494,7 +4494,7 @@
- Phase: SPEC
- Platforms: (depends on openssl installation)
-
--Sets the protocol version to be used. Valid strings (not case sensitive) are:
-+Sets the protocol version to be used. Valid strings (not case sensitive) are:
- SSLv2 Select SSL protocol version 2.
- SSLv3 Select SSL protocol version 3.
- SSLv23 Select SSL protocol version 2 or 3. This is the default when
-@@ -4511,7 +4511,7 @@
- Platforms: (depends on openssl installation)
-
- Controls check of the peer's certificate. Default is 1 (true). Disabling
-- verify might open your socket for everyone!
-+ verify might open your socket for everyone!
-
-
- Option: openssl-certificate=file
-@@ -4550,7 +4550,7 @@
- Platforms: (depends on openssl installation)
-
- Specifies the file with the trusted (root) authority certificates. The file
--must be in PEM format and should contain one or more certificates.
-+must be in PEM format and should contain one or more certificates.
-
-
- Option: openssl-capath=directory
-@@ -4563,20 +4563,7 @@
-
- Specify the directory with the trusted (root) certificates. The directory
- must contain certificates in PEM format and their hashes (see OpenSSL
--documentation)
--
--
--Option: openssl-egd=file
--Aliases: egd
--
--Type: FILENAME
--Option group: OPENSSL
--Phase: SPEC
--Platforms: (depends on openssl installation)
--
--On some systems, openssl requires an explicit source of random data. Specify
--the socket name where an entropy gathering daemon like egd provides random
--data, e.g. /dev/egd-pool.
-+documentation)
-
-
- Option: openssl-pseudo
-@@ -4640,10 +4627,10 @@
- Platforms: all
-
- This option has to be supported by the application. For socat it means that an
--EOF condition on this data source does not trigger termination procedures, but
-+EOF condition on this data source does not trigger termination procedures, but
- instead the read/write loop waits for one second and then tries to read more
- input data. This behaviour emulates "tail -f" and might not be useful for all
--kinds of input devices, but regular files and /dev/null are good candidates.
-+kinds of input devices, but regular files and /dev/null are good candidates.
- Termination of socat then can only occur by EOF condition of the other input
- device, an error, or by external events.
-
-@@ -4716,8 +4703,8 @@
- Phase: INIT
- Platforms: all
-
--Number of retries before the connection or listen attempt is aborted.
--Default is 0, which means just one attempt.
-+Number of retries before the connection or listen attempt is aborted.
-+Default is 0, which means just one attempt.
-
-
- Option: interval=<double>
-@@ -4886,7 +4873,7 @@
- The following desribes typical steps for generating a sandbox. Depending on
- your operating system, application, and security requirements, your mileage may
- vary. With the below steps, you will be able to run some check programs to play
--around with the sandbox.
-+around with the sandbox.
-
- I Installation
- 1) Create a sandbox group - but give it and all following "sandbox" ids a more
-@@ -4906,7 +4893,7 @@
- 9) Copy test programs and utilities to bin, e.g. su, id, ls, mount, strace (but
- without SUID/SGID)
- 10) Copy the required shared libraries and the shared library loader to their
--directories.
-+directories.
- On Linux, e.g. /lib/ld-linux.so.2, /lib/libnss_compat.so.2
- Note: it is often difficult to find out what shared libraries are (still) not
- installed in the sandbox. The programs invoked in the sandbox typically do not
-diff -ru socat-1.7.3.0/sslcls.c socat-1.7.3.0.new/sslcls.c
---- socat-1.7.3.0/sslcls.c 2015-01-24 18:15:22.000000000 +0800
-+++ socat-1.7.3.0.new/sslcls.c 2015-11-18 10:56:02.408674607 +0800
-@@ -10,6 +10,8 @@
-
- #if WITH_SYCLS && WITH_OPENSSL
-
-+#include <openssl/comp.h>
-+
- #include "sysincludes.h"
-
- #include "mytypes.h"
-@@ -262,7 +264,7 @@
- Debug1("SSL_connect(%p)", ssl);
- result = SSL_connect(ssl);
- Debug1("SSL_connect() -> %d", result);
-- return result;
-+ return result;
- }
-
- int sycSSL_accept(SSL *ssl) {
-@@ -270,7 +272,7 @@
- Debug1("SSL_accept(%p)", ssl);
- result = SSL_accept(ssl);
- Debug1("SSL_accept() -> %d", result);
-- return result;
-+ return result;
- }
-
- int sycSSL_read(SSL *ssl, void *buf, int num) {
-@@ -306,7 +308,7 @@
- } else {
- Debug("SSL_get_peer_certificate() -> NULL");
- }
-- return result;
-+ return result;
- }
-
- int sycSSL_shutdown(SSL *ssl) {
-@@ -331,14 +333,6 @@
- return;
- }
-
--int sycRAND_egd(const char *path) {
-- int result;
-- Debug1("RAND_egd(\"%s\")", path);
-- result = RAND_egd(path);
-- Debug1("RAND_egd() -> %d", result);
-- return result;
--}
--
- DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
- DH *result;
- Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
-@@ -375,7 +369,7 @@
- }
- #endif /* WITH_FIPS */
-
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) {
- const COMP_METHOD *result;
- Debug1("SSL_get_current_compression(%p)", ssl);
-diff -ru socat-1.7.3.0/sslcls.h socat-1.7.3.0.new/sslcls.h
---- socat-1.7.3.0/sslcls.h 2015-01-24 18:15:22.000000000 +0800
-+++ socat-1.7.3.0.new/sslcls.h 2015-11-18 10:56:02.408674607 +0800
-@@ -8,6 +8,8 @@
- #if WITH_SYCLS
- #if WITH_OPENSSL
-
-+#include <openssl/comp.h>
-+
- void sycSSL_load_error_strings(void);
- int sycSSL_library_init(void);
- const SSL_METHOD *sycSSLv2_client_method(void);
-@@ -47,7 +49,6 @@
- int sycSSL_shutdown(SSL *ssl);
- void sycSSL_CTX_free(SSL_CTX *ctx);
- void sycSSL_free(SSL *ssl);
--int sycRAND_egd(const char *path);
-
- DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u);
-
-@@ -55,7 +56,7 @@
-
- int sycFIPS_mode_set(int onoff);
-
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl);
- const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl);
- const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
-@@ -98,7 +99,6 @@
- #define sycSSL_shutdown(s) SSL_shutdown(s)
- #define sycSSL_CTX_free(c) SSL_CTX_free(c)
- #define sycSSL_free(s) SSL_free(s)
--#define sycRAND_egd(p) RAND_egd(p)
-
- #define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u)
-
-@@ -115,4 +115,3 @@
- #endif /* !WITH_SYCLS */
-
- #endif /* !defined(__sslcls_h_included) */
--
-diff -ru socat-1.7.3.0/xio-openssl.c socat-1.7.3.0.new/xio-openssl.c
---- socat-1.7.3.0/xio-openssl.c 2015-01-24 22:33:42.000000000 +0800
-+++ socat-1.7.3.0.new/xio-openssl.c 2015-11-18 10:56:19.441674259 +0800
-@@ -6,9 +6,11 @@
-
- #include "xiosysincludes.h"
- #if WITH_OPENSSL /* make this address configure dependend */
-+#include <openssl/comp.h>
- #include <openssl/conf.h>
- #include <openssl/x509v3.h>
-
-+
- #include "xioopen.h"
-
- #include "xio-fd.h"
-@@ -18,7 +20,7 @@
- #include "xio-openssl.h"
-
- /* the openssl library requires a file descriptor for external communications.
-- so our best effort is to provide any possible kind of un*x file descriptor
-+ so our best effort is to provide any possible kind of un*x file descriptor
- (not only tcp, but also pipes, stdin, files...)
- for tcp we want to provide support for socks and proxy.
- read and write functions must use the openssl crypt versions.
-@@ -108,9 +110,8 @@
- const struct optdesc opt_openssl_dhparam = { "openssl-dhparam", "dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
- const struct optdesc opt_openssl_cafile = { "openssl-cafile", "cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
- const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
--const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
- const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC };
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC };
- #endif
- #if WITH_FIPS
-@@ -147,7 +148,7 @@
- static void openssl_conn_loginfo(SSL *ssl) {
- Notice1("SSL connection using %s", SSL_get_cipher(ssl));
-
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- {
- const COMP_METHOD *comp, *expansion;
-
-@@ -226,7 +227,7 @@
-
- retropt_string(opts, OPT_OPENSSL_CERTIFICATE, &opt_cert);
- retropt_string(opts, OPT_OPENSSL_COMMONNAME, (char **)&opt_commonname);
--
-+
- if (opt_commonname == NULL) {
- opt_commonname = hostname;
- }
-@@ -453,7 +454,7 @@
- #else
- pf = PF_INET;
- #endif
--
-+
- portname = argv[1];
-
- xfd->howtoend = END_SHUTDOWN;
-@@ -722,7 +723,6 @@
- char *opt_dhparam = NULL; /* file name of DH params */
- char *opt_cafile = NULL; /* certificate authority file */
- char *opt_capath = NULL; /* certificate authority directory */
-- char *opt_egd = NULL; /* entropy gathering daemon socket path */
- #if OPENSSL_VERSION_NUMBER >= 0x00908000L
- char *opt_compress = NULL; /* compression method */
- #endif
-@@ -741,9 +741,8 @@
- retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath);
- retropt_string(opts, OPT_OPENSSL_KEY, &opt_key);
- retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
-- retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
- retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
- #endif
- #if WITH_FIPS
-@@ -767,7 +766,7 @@
-
- /* OpenSSL preparation */
- sycSSL_library_init();
--
-+
- /*! actions_to_seed_PRNG();*/
-
- if (!server) {
-@@ -877,10 +876,6 @@
- }
- }
-
-- if (opt_egd) {
-- sycRAND_egd(opt_egd);
-- }
--
- if (opt_pseudo) {
- long int randdata;
- /* initialize libc random from actual microseconds */
-@@ -1098,7 +1093,7 @@
- if (e == ((ERR_LIB_RAND<<24)|
- (RAND_F_SSLEAY_RAND_BYTES<<12)|
- (RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) {
-- Error("too few entropy; use options \"egd\" or \"pseudo\"");
-+ Error("too few entropy; use options \"pseudo\"");
- stat = STAT_NORETRY;
- } else {
- Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf));
-@@ -1302,7 +1297,7 @@
- unsigned char *text;
- ind = X509_NAME_get_index_by_NID(name, NID_commonName, -1);
- if (ind < 0) {
-- Info("no COMMONNAME field in peer certificate");
-+ Info("no COMMONNAME field in peer certificate");
- return false;
- }
- entry = X509_NAME_get_entry(name, ind);
-@@ -1384,7 +1379,7 @@
- extstr = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
- if (!strcasecmp(extstr, "subjectAltName")) {
- void *names;
-- if (!(meth = X509V3_EXT_get(ext))) break;
-+ if (!(meth = X509V3_EXT_get(ext))) break;
- names = X509_get_ext_d2i(peer_cert, NID_subject_alt_name, NULL, NULL);
- if (names) {
- int numalts;
-@@ -1400,7 +1395,7 @@
- switch ( pName->type ) {
-
- case GEN_DNS:
-- ASN1_STRING_to_UTF8(&pBuffer,
-+ ASN1_STRING_to_UTF8(&pBuffer,
- pName->d.ia5);
- xiosetenv("OPENSSL_X509V3_SUBJECTALTNAME_DNS", (char *)pBuffer, 2, " // ");
- if (peername != NULL &&
-diff -ru socat-1.7.3.0/xio-openssl.h socat-1.7.3.0.new/xio-openssl.h
---- socat-1.7.3.0/xio-openssl.h 2015-01-24 18:15:22.000000000 +0800
-+++ socat-1.7.3.0.new/xio-openssl.h 2015-11-18 10:56:02.410674607 +0800
-@@ -21,9 +21,8 @@
- extern const struct optdesc opt_openssl_dhparam;
- extern const struct optdesc opt_openssl_cafile;
- extern const struct optdesc opt_openssl_capath;
--extern const struct optdesc opt_openssl_egd;
- extern const struct optdesc opt_openssl_pseudo;
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- extern const struct optdesc opt_openssl_compress;
- #endif
- #if WITH_FIPS
-diff -ru socat-1.7.3.0/xioopts.c socat-1.7.3.0.new/xioopts.c
---- socat-1.7.3.0/xioopts.c 2015-01-24 18:15:22.000000000 +0800
-+++ socat-1.7.3.0.new/xioopts.c 2015-11-18 10:56:02.412674607 +0800
-@@ -19,37 +19,37 @@
- #if WITH_NAMED
- # define IF_NAMED(a,b) {a,b},
- #else
--# define IF_NAMED(a,b)
-+# define IF_NAMED(a,b)
- #endif
-
- #if WITH_PIPE || WITH_GOPEN
- # define IF_OPEN(a,b) {a,b},
- #else
--# define IF_OPEN(a,b)
-+# define IF_OPEN(a,b)
- #endif
-
- #if WITH_TERMIOS
- # define IF_TERMIOS(a,b) {a,b},
- #else
--# define IF_TERMIOS(a,b)
-+# define IF_TERMIOS(a,b)
- #endif
-
- #if WITH_EXEC
- # define IF_EXEC(a,b) {a,b},
- #else
--# define IF_EXEC(a,b)
-+# define IF_EXEC(a,b)
- #endif
-
- #if _WITH_SOCKET
- # define IF_SOCKET(a,b) {a,b},
- #else
--# define IF_SOCKET(a,b)
-+# define IF_SOCKET(a,b)
- #endif
-
- #if WITH_LISTEN
- # define IF_LISTEN(a,b) {a,b},
- #else
--# define IF_LISTEN(a,b)
-+# define IF_LISTEN(a,b)
- #endif
-
- #if (WITH_UDP || WITH_TCP) && WITH_LISTEN
-@@ -61,43 +61,43 @@
- #if WITH_IP4 || WITH_IP6
- # define IF_IP(a,b) {a,b},
- #else
--# define IF_IP(a,b)
-+# define IF_IP(a,b)
- #endif
-
- #if WITH_IP6
- # define IF_IP6(a,b) {a,b},
- #else
--# define IF_IP6(a,b)
-+# define IF_IP6(a,b)
- #endif
-
- #if WITH_TCP|WITH_UDP
- # define IF_IPAPP(a,b) {a,b},
- #else
--# define IF_IPAPP(a,b)
-+# define IF_IPAPP(a,b)
- #endif
-
- #if WITH_TCP
- # define IF_TCP(a,b) {a,b},
- #else
--# define IF_TCP(a,b)
-+# define IF_TCP(a,b)
- #endif
-
- #if WITH_SCTP
- # define IF_SCTP(a,b) {a,b},
- #else
--# define IF_SCTP(a,b)
-+# define IF_SCTP(a,b)
- #endif
-
- #if WITH_SOCKS4
- # define IF_SOCKS4(a,b) {a,b},
- #else
--# define IF_SOCKS4(a,b)
-+# define IF_SOCKS4(a,b)
- #endif
-
- #if WITH_PROXY
- # define IF_PROXY(a,b) {a,b},
- #else
--# define IF_PROXY(a,b)
-+# define IF_PROXY(a,b)
- #endif
-
- #if WITH_READLINE
-@@ -133,7 +133,7 @@
- #if WITH_RETRY
- # define IF_RETRY(a,b) {a,b},
- #else
--# define IF_RETRY(a,b)
-+# define IF_RETRY(a,b)
- #endif
-
-
-@@ -296,7 +296,7 @@
- #if WITH_EXT2 && defined(EXT2_COMPR_FL)
- IF_ANY ("compr", &opt_ext2_compr)
- #endif
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- IF_OPENSSL("compress", &opt_openssl_compress)
- #endif
- #ifdef TCP_CONN_ABORT_THRESHOLD /* HP_UX */
-@@ -412,7 +412,6 @@
- #ifdef ECHOPRT
- IF_TERMIOS("echoprt", &opt_echoprt)
- #endif
-- IF_OPENSSL("egd", &opt_openssl_egd)
- IF_ANY ("end-close", &opt_end_close)
- IF_TERMIOS("eof", &opt_veof)
- IF_TERMIOS("eol", &opt_veol)
-@@ -937,7 +936,7 @@
- #ifdef O_NOFOLLOW
- IF_OPEN ("nofollow", &opt_o_nofollow)
- #endif
-- IF_EXEC ("nofork", &opt_nofork)
-+ IF_EXEC ("nofork", &opt_nofork)
- #ifdef O_NOINHERIT
- IF_ANY ("noinherit", &opt_o_noinherit)
- #endif
-@@ -1098,11 +1097,10 @@
- IF_OPENSSL("openssl-certificate", &opt_openssl_certificate)
- IF_OPENSSL("openssl-cipherlist", &opt_openssl_cipherlist)
- IF_OPENSSL("openssl-commonname", &opt_openssl_commonname)
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- IF_OPENSSL("openssl-compress", &opt_openssl_compress)
- #endif
- IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam)
-- IF_OPENSSL("openssl-egd", &opt_openssl_egd)
- #if WITH_FIPS
- IF_OPENSSL("openssl-fips", &opt_openssl_fips)
- #endif
-@@ -1751,20 +1749,20 @@
- } ;
-
-
--/* walks the text argument a and writes its options that conform to groups
-+/* walks the text argument a and writes its options that conform to groups
- to the array opts. Uses the option table 'optionnames'.
-- returns 0 on success, -1 on error, 1 on unknown/wrong option
-+ returns 0 on success, -1 on error, 1 on unknown/wrong option
- */
- int parseopts(const char **a, unsigned int groups, struct opt **opts) {
-
-- return parseopts_table(a, groups, opts, optionnames,
-+ return parseopts_table(a, groups, opts, optionnames,
- sizeof(optionnames)/sizeof(struct optname)-1);
- }
-
-
--/* walks the text argument a and writes its options that conform to groups
-+/* walks the text argument a and writes its options that conform to groups
- to the array opts. Uses the specified option table.
-- returns 0 on success, -1 on error, 1 on unknown/wrong option
-+ returns 0 on success, -1 on error, 1 on unknown/wrong option
- */
- int parseopts_table(const char **a, unsigned int groups, struct opt **opts,
- const struct optname optionnames[], size_t optionnum) {
-@@ -1864,7 +1862,7 @@
- #endif
- }
- (*opts)[i].desc = ent->desc;
--
-+
- if (!strncmp(*a, assign_str, strlen(assign_str))) {
- /* there is an assignment (mostly "=") */
- (*a) += strlen(assign_str);
-@@ -2127,7 +2125,7 @@
-
- #if LATER
- case TYPE_INT3:
--
-+
- break;
- #endif
-
-@@ -2389,7 +2387,7 @@
- *buffp++ = '\0';
- (*opts)[i].value.u_ip_mreq.param2 = strdup(buff); /*!!! NULL */
-
--#if HAVE_STRUCT_IP_MREQN
-+#if HAVE_STRUCT_IP_MREQN
- if (*tokp++ == ':') {
- strncpy((*opts)[i].value.u_ip_mreq.ifindex, tokp, IF_NAMESIZE); /* ok */
- Info4("setting option \"%s\" to {\"%s\",\"%s\",\"%s\"}",
-@@ -2572,7 +2570,7 @@
- /* does not set GROUP_FD; cannot determine GROUP_TERMIOS ! */
- int _groupbits(mode_t mode) {
- unsigned int result = 0;
--
-+
- switch ((mode&S_IFMT)>>12) {
- case (S_IFIFO>>12): /* 1, FIFO */
- result = GROUP_FIFO; break;
-@@ -2665,8 +2663,8 @@
- opt->desc = ODESC_DONE;
- return 0;
- }
--
--
-+
-+
- /* Looks for the first option of type <optcode>. If the option is found,
- this function stores its bool value in *result, "consumes" the
- option, and returns 0.
-@@ -2941,7 +2939,7 @@
- != STAT_OK) {
- Error("error resolving bind option");
- return STAT_NORETRY;
-- }
-+ }
- break;
- #endif /* WITH_IP4 || WITH_IP6 */
-
-@@ -3291,7 +3289,7 @@
- opt->desc->type);
- }
- #endif /* _WITH_SOCKET */
--
-+
- #if HAVE_FLOCK
- } else if (opt->desc->func == OFUNC_FLOCK) {
- if (Flock(fd, opt->desc->major) < 0) {
-@@ -3343,7 +3341,7 @@
- opt->desc = ODESC_ERROR; ++opt; continue;
- }
- #endif /* HAVE_FTRUNCATE64 */
-- break;
-+ break;
- case OPT_F_SETLK_RD:
- case OPT_F_SETLK_WR:
- case OPT_F_SETLKW_RD:
-@@ -3360,7 +3358,7 @@
- opt->desc = ODESC_ERROR; ++opt; continue;
- }
- }
-- break;
-+ break;
- case OPT_SETUID_EARLY:
- case OPT_SETUID:
- if (Setuid(opt->value.u_uidt) < 0) {
-@@ -3472,7 +3470,7 @@
- } else {
- if (Setsid() < 0) {
- Error1("setsid(): %s", strerror(errno));
-- }
-+ }
- }
- }
- break;
-@@ -3818,7 +3816,7 @@
- if (!opts) return 0;
-
- while (opt->desc != ODESC_END) {
-- if (opt->desc != ODESC_DONE &&
-+ if (opt->desc != ODESC_DONE &&
- (opt->desc->group & group)) {
- if (opt->desc->func == OFUNC_FLAG) {
- if (opt->value.u_bool) {
-@@ -3995,7 +3993,7 @@
- }
- xfd->havelock = true;
- break;
--
-+
- default:
- /* just store the value in the correct component of struct single */
- if (opt->desc->type == TYPE_CONST) {
-@@ -4080,7 +4078,7 @@
- if (ifindex(opt->value.u_ip_mreq.ifindex,
- (unsigned int *)&ip4_mreqn.mreqn.imr_ifindex, -1)
- < 0) {
-- Error1("cannot resolve interface \"%s\"",
-+ Error1("cannot resolve interface \"%s\"",
- opt->value.u_ip_mreq.ifindex);
- }
- #endif /* HAVE_STRUCT_IP_MREQN */
-@@ -4106,7 +4104,7 @@
- ip4_mreqn.mreq.imr_interface = sockaddr2.ip4.sin_addr;
- }
- }
--
-+
- #if LATER
- if (0) {
- ; /* for canonical reasons */
-@@ -4273,4 +4271,3 @@
- }
- return 0;
- }
--
-diff -ru socat-1.7.3.0/xioopts.h socat-1.7.3.0.new/xioopts.h
---- socat-1.7.3.0/xioopts.h 2015-01-24 18:15:22.000000000 +0800
-+++ socat-1.7.3.0.new/xioopts.h 2015-11-18 10:56:02.412674607 +0800
-@@ -114,10 +114,10 @@
-
- /* for simpler handling of option-to-connection-type relations we define
- groups. to keep the search for options simple, we allow each option to
-- belong to at most one group only. (we have a dummy GROUP_NONE for those
-+ belong to at most one group only. (we have a dummy GROUP_NONE for those
- that don't want to belong to any...)
- The caller of parseopts() specifies per bitpatter a set of groups where it
-- accepts options from.
-+ accepts options from.
- */
-
- /*- the group bits are:
-@@ -474,11 +474,10 @@
- OPT_OPENSSL_CERTIFICATE,
- OPT_OPENSSL_CIPHERLIST,
- OPT_OPENSSL_COMMONNAME,
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
-+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
- OPT_OPENSSL_COMPRESS,
- #endif
- OPT_OPENSSL_DHPARAM,
-- OPT_OPENSSL_EGD,
- OPT_OPENSSL_FIPS,
- OPT_OPENSSL_KEY,
- OPT_OPENSSL_METHOD,
diff --git a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
deleted file mode 100644
index 861c673..0000000
--- a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aae2ea107b543fa908956f2fdcdf6db684e4a2e6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 24 Apr 2015 23:06:37 -0400
-Subject: [PATCH] filan: fix depend list
-
-The link line contains more objects than the depend line; sync them like
-procan does. Otherwise, parallel builds randomly fail.
----
- Makefile.in | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f2a6edb..0c00459 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -118,8 +118,9 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
- procan: $(PROCAN_OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
-
--filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS)
-+FILAN_OBJS=filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
-+filan: $(FILAN_OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FILAN_OBJS) $(CLIBS)
-
- libxio.a: $(XIOOBJS) $(UTLOBJS)
- $(AR) r $@ $(XIOOBJS) $(UTLOBJS)
---
-2.3.5
-
diff --git a/net-misc/socat/files/socat-1.7.3.1-no-ssl3.patch b/net-misc/socat/files/socat-1.7.3.1-no-ssl3.patch
deleted file mode 100644
index 847dd4f..0000000
--- a/net-misc/socat/files/socat-1.7.3.1-no-ssl3.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/sslcls.c.orig b/sslcls.c
-index 6ddc077..cc07220 100644
---- a/sslcls.c.orig
-+++ b/sslcls.c
-@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
- }
- #endif
-
-+#if HAVE_SSLv3_client_method
- const SSL_METHOD *sycSSLv3_client_method(void) {
- const SSL_METHOD *result;
- Debug("SSLv3_client_method()");
-@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
- Debug1("SSLv3_client_method() -> %p", result);
- return result;
- }
-+#endif
-
-+#if HAVE_SSLv3_server_method
- const SSL_METHOD *sycSSLv3_server_method(void) {
- const SSL_METHOD *result;
- Debug("SSLv3_server_method()");
-@@ -70,7 +73,9 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
- Debug1("SSLv3_server_method() -> %p", result);
- return result;
- }
-+#endif
-
-+#if HAVE_SSLv23_client_method
- const SSL_METHOD *sycSSLv23_client_method(void) {
- const SSL_METHOD *result;
- Debug("SSLv23_client_method()");
-@@ -78,7 +83,9 @@ const SSL_METHOD *sycSSLv23_client_method(void) {
- Debug1("SSLv23_client_method() -> %p", result);
- return result;
- }
-+#endif
-
-+#if HAVE_SSLv23_server_method
- const SSL_METHOD *sycSSLv23_server_method(void) {
- const SSL_METHOD *result;
- Debug("SSLv23_server_method()");
-@@ -86,7 +93,9 @@ const SSL_METHOD *sycSSLv23_server_method(void) {
- Debug1("SSLv23_server_method() -> %p", result);
- return result;
- }
-+#endif
-
-+#if HAVE_TLSv1_client_method
- const SSL_METHOD *sycTLSv1_client_method(void) {
- const SSL_METHOD *result;
- Debug("TLSv1_client_method()");
-@@ -94,7 +103,9 @@ const SSL_METHOD *sycTLSv1_client_method(void) {
- Debug1("TLSv1_client_method() -> %p", result);
- return result;
- }
-+#endif
-
-+#if HAVE_TLSv1_server_method
- const SSL_METHOD *sycTLSv1_server_method(void) {
- const SSL_METHOD *result;
- Debug("TLSv1_server_method()");
-@@ -102,6 +113,7 @@ const SSL_METHOD *sycTLSv1_server_method(void) {
- Debug1("TLSv1_server_method() -> %p", result);
- return result;
- }
-+#endif
-
- #if HAVE_TLSv1_1_client_method
- const SSL_METHOD *sycTLSv1_1_client_method(void) {
diff --git a/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
deleted file mode 100644
index c914a81..0000000
--- a/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-When disabling OpenSSL support, nestlex.c still needs stddef.h which is
-magically included through the OpenSSL headers otherwise.
-
---- a/configure.in
-+++ b/configure.in
-@@ -61,7 +61,7 @@
- AC_CHECK_HEADERS(inttypes.h)
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h)
--AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
-+AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
- AC_CHECK_HEADERS(pty.h)
- AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
- AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
---- a/config.h.in
-+++ b/config.h.in
-@@ -189,6 +189,9 @@
- /* Define if you have the <grp.h> header file. */
- #undef HAVE_GRP_H
-
-+/* Define if you have the <stddef.h> header file. */
-+#undef HAVE_STDDEF_H
-+
- /* Define if you have the <stdint.h> header file. */
- #undef HAVE_STDINT_H
-
---- a/sysincludes.h
-+++ b/sysincludes.h
-@@ -51,6 +51,9 @@
- #if HAVE_SYS_TIME_H
- #include <sys/time.h> /* select(); OpenBSD: struct timespec */
- #endif
-+#if HAVE_STDDEF_H
-+#include <stddef.h>
-+#endif
- #if HAVE_STDINT_H
- #include <stdint.h> /* uint8_t */
- #endif
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
deleted file mode 100644
index 2c2a792..0000000
--- a/net-misc/socat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/net-misc/socat/socat-1.7.3.1.ebuild b/net-misc/socat/socat-1.7.3.1.ebuild
deleted file mode 100644
index 547ecd5..0000000
--- a/net-misc/socat/socat-1.7.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ssl libressl readline ipv6 tcpd"
-
-DEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- readline? ( sys-libs/readline:= )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-DOCS=(
- BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
-)
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
- epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
- use libressl && epatch "${FILESDIR}"/0001-remove-openssl-comp.patch
-
- # Fix for LibreSSL >= 2.3.0
- epatch "${FILESDIR}"/${PN}-1.7.3.1-no-ssl3.patch
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- filter-flags '-Wno-error*' #293324
- tc-export AR
- econf \
- $(use_enable ssl openssl) \
- $(use_enable readline) \
- $(use_enable ipv6 ip6) \
- $(use_enable tcpd libwrap)
-}
-
-src_install() {
- default
-
- dohtml doc/*.html doc/*.css
-}