From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/socat/, net-misc/socat/files/
Date: Thu, 7 Jan 2021 03:07:01 +0000 (UTC) [thread overview]
Message-ID: <1609988818.df13bd514e0d04eb52593e0b43c40c422ce09ad4.sam@gentoo> (raw)
commit: df13bd514e0d04eb52593e0b43c40c422ce09ad4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 03:02:23 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 03:06:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df13bd51
net-misc/socat: sync live
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/socat/files/socat-9999-stddef_h.patch | 38 --------------------------
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 802b578d4a2..00000000000
--- 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 7d28699e42f..b7f8ff16c50 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) \
next reply other threads:[~2021-01-07 3:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 3:07 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-30 23:27 [gentoo-commits] repo/gentoo:master commit in: net-misc/socat/, net-misc/socat/files/ Sam James
2020-01-27 11:05 Jeroen Roovers
2019-04-18 15:19 Jeroen Roovers
2016-03-05 8:26 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609988818.df13bd514e0d04eb52593e0b43c40c422ce09ad4.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox