net-misc/socat: bring in line with the tree

Package-Manager: portage-2.2.26

4 files changed, 42 insertions, 63 deletions

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index ca5a504..68a8b81 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,6 +1 @@
-AUX 0001-remove-openssl-comp.patch 39067 SHA256 107237b95a5a7c945aabc739db98c7592cf701c3c4e8fcf907771fe289835971 SHA512 820e10895b331d7f8039f394b780f451f594f39d4923badcb9804a760cef4209cce698d5ae05162b1d8164b7ce0da6707790e87a7f6f6fdda10b433d5c94e49f WHIRLPOOL 5f50f1dc59193e6b4a842c4a03f278bc7ebbede355a6410053cd32c8219eb981b29b8735050b15af4072961bae755e6b69cff63c3e5b9152c8773f785e125ddb
-AUX socat-1.7.3.0-filan-build.patch 1164 SHA256 1916386401f633c4d4e74aa61ca3039580cb69b6d89e69e73e0eaf9d463c1c15 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf WHIRLPOOL 187535c491bb3ba7b83df865077038a054c7aa7ba3a39ad3ba868db62db113bc876f4bf3da6cdffc5cfc03ac6f4ac5ceb5058cf8185622a3dce290772306fa41
 DIST socat-1.7.3.1.tar.bz2 488467 SHA256 d2da659540c38139f388e9437bfaae16bb458d174d056cb3228432a8f489fbaa SHA512 463340f578d4d1d54458b8ef9573ad3eff51dbcc736205e1b62e9a4782770d4bb76e6a07506350fd35405b130660559aaa79dfa2664c53ea268d7d64231f9b32 WHIRLPOOL 09f0fc537eaad194cac97cce73971c9f69047c648f03788fa69ac3444673ff73f143b2657d0ed28d082e2cfc36829304ed7bf0ff79c7ed75e96c991292f94dd4
-EBUILD socat-1.7.3.1-r1.ebuild 1263 SHA256 0648e48defe9ab471c6d56237b3abd34811cc2acd4b15b37760a8e1f86930df5 SHA512 9b18d343ba301e4a3da2a5cd718b6cfa5eb8f1358518ff87e4bfa9432675b4d78c9ed869fbd6dcb12b74646a231827a45f64fa48e31cb9cfd9b5ece0d9a6aba4 WHIRLPOOL b0230bdb47342ba574f3f4af8d153b8d021f3cce4ec7dbfc421939d761f1e2b6e9ff95bb8f335fffa5152a30f70970fb499e728d49c52692aa11d6180a19b706
-EBUILD socat-1.7.3.1.ebuild 1166 SHA256 bb5606359fe367c414bdabf32e8a4c28ba7f76fc2c0a978712f1b91690194518 SHA512 182aaa3b69a791a7a250d295c490822c7de69b24b55e6258dcff270dbcfeeacb8b6d44ef7a0f7c68043d81da0643042fd79d4e80b70ea6263a88acd61faa302d WHIRLPOOL 03ffe90c314355f5eee5553d3dfaa366b69f19aadea614d3dd60e160450c884ab50275ba3374e386fedb0e4850598f65452c596c53fa19331491a168b3443c20
-MISC metadata.xml 280 SHA256 b04c5b9d91f6c4d6e36583488fd032751034d1e035085609c9bdf7677cf1e83f SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef WHIRLPOOL 6f3756b9ac748acccb6ac5a4de133cf93988e8c904f606376fecbb6a21ce038e86437fecca43b2521538da2570d33ff1a6a1e0cab290a3d71a9b4f2734f16328
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
new file mode 100644
index 0000000..c914a81
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
@@ -0,0 +1,38 @@
+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/socat-1.7.3.1-r1.ebuild b/net-misc/socat/socat-1.7.3.1-r1.ebuild
index 603010f..25fe724 100644
--- a/net-misc/socat/socat-1.7.3.1-r1.ebuild
+++ b/net-misc/socat/socat-1.7.3.1-r1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/"
@@ -34,12 +34,10 @@ DOCS=(
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
-
-	if use libressl; then
-	epatch "${FILESDIR}"/0001-remove-openssl-comp.patch
-	fi
-
+	epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+	use libressl && epatch "${FILESDIR}"/0001-remove-openssl-comp.patch
 	epatch_user
+	eautoreconf
 }
 
 src_configure() {
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 2648694..0000000
--- a/net-misc/socat/socat-1.7.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit 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 hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ssl readline ipv6 tcpd"
-
-DEPEND="
-	ssl? ( dev-libs/openssl: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}"/0001-remove-openssl-comp.patch
-	epatch_user
-}
-
-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
-}