diff options
| author |   Sam James <sam@gentoo.org> | 2021-01-07 03:02:23 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-01-07 03:06:58 +0000 |
| commit | df13bd514e0d04eb52593e0b43c40c422ce09ad4 (patch) | |
| tree | 953a1e0dc955cb0c798514587ebe7a346be605f2 | |
| parent | net-misc/socat: bump to 1.7.4.0 (diff) | |
| download | gentoo-df13bd51.tar.gz gentoo-df13bd51.tar.bz2 gentoo-df13bd51.zip | |
net-misc/socat: sync live
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | net-misc/socat/files/socat-9999-stddef_h.patch | 38 | ||||
| -rw-r--r-- | net-misc/socat/socat-9999.ebuild | 29 |
2 files changed, 11 insertions, 56 deletions
diff --git a/net-misc/socat/files/socat-9999-stddef_h.patch b/net-misc/socat/files/socat-9999-stddef_h.patch deleted file mode 100644 index 802b578d4a29..000000000000 --- a/net-misc/socat/files/socat-9999-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.ac -+++ b/configure.ac -@@ -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-9999.ebuild b/net-misc/socat/socat-9999.ebuild index 7d28699e42fd..b7f8ff16c508 100644 --- a/net-misc/socat/socat-9999.ebuild +++ b/net-misc/socat/socat-9999.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic git-r3 toolchain-funcs + +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Multipurpose relay (SOcket CAT)" HOMEPAGE="http://www.dest-unreach.org/socat/" @@ -10,9 +11,9 @@ EGIT_REPO_URI="https://repo.or.cz/${PN}.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="libressl ssl readline ipv6 tcpd" +IUSE="bindist libressl ssl readline ipv6 tcpd" +BDEPEND="app-text/yodl" DEPEND=" ssl? ( !libressl? ( dev-libs/openssl:0= ) @@ -21,24 +22,16 @@ DEPEND=" readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) " -BDEPEND=" - app-text/yodl -" -DEPEND=" - ${RDEPEND} -" +RDEPEND="${DEPEND}" + +# Tests are a large bash script +# Hard to disable individual tests needing network or privileges RESTRICT=" test ssl? ( readline? ( bindist ) ) " -DOCS=( - BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY -) -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch - "${FILESDIR}"/${PN}-9999-stddef_h.patch -) +DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) pkg_setup() { # bug #587740 @@ -51,13 +44,13 @@ pkg_setup() { src_prepare() { default - eautoreconf } src_configure() { filter-flags '-Wno-error*' #293324 tc-export AR + econf \ $(use_enable ssl openssl) \ $(use_enable readline) \ |