From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/
Date: Fri, 26 May 2023 09:35:32 +0000 (UTC) [thread overview]
Message-ID: <1685093716.720d4808a276e29d61ff552cfd090a688fe0052f.sam@gentoo> (raw)
commit: 720d4808a276e29d61ff552cfd090a688fe0052f
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu May 25 13:30:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 26 09:35:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720d4808
net-misc/socat: drop 2.0.0_beta9
The socat2 build fails with musl and the most recent 2.0.0_beta9 release
came out 7 years ago on January 26 2016. However several socat1 releases
have since been made. In the event that upstream ever resumes their work
on socat2 then it can be added back to Gentoo.
Closes: https://bugs.gentoo.org/907177
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/31158
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/socat/Manifest | 1 -
.../socat/files/socat-1.7.3.0-filan-build.patch | 30 ---------
net-misc/socat/files/socat-1.7.3.1-stddef_h.patch | 38 -----------
.../socat/files/socat-1.7.3.4-fno-common.patch | 24 -------
net-misc/socat/socat-2.0.0_beta9.ebuild | 74 ----------------------
5 files changed, 167 deletions(-)
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index cddac553abf2..ae6c8cfa71c3 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,2 @@
DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b SHA512 81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046
DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad SHA512 3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
-DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
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 861c673ad91d..000000000000
--- 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-stddef_h.patch b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
deleted file mode 100644
index c914a817ceca..000000000000
--- 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/files/socat-1.7.3.4-fno-common.patch b/net-misc/socat/files/socat-1.7.3.4-fno-common.patch
deleted file mode 100644
index a7dcf71c376a..000000000000
--- a/net-misc/socat/files/socat-1.7.3.4-fno-common.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/filan.c
-+++ b/filan.c
-@@ -30,7 +30,9 @@
-
- /* dirty workaround so we dont get an error on AIX when being linked with
- libwrap */
-+#if _AIX
- int allow_severity, deny_severity;
-+#endif
-
- /* global variables for configuring filan */
- bool filan_followsymlinks;
---- a/procan.c
-+++ b/procan.c
-@@ -21,7 +21,9 @@
-
- /* dirty workaround so we dont get an error on AIX when getting linked with
- libwrap */
-+#if _AIX
- int allow_severity, deny_severity;
-+#endif
-
-
- int procan(FILE *outfile) {
diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild
deleted file mode 100644
index 441acceaeede..000000000000
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 readline ssl tcpd"
-
-DEPEND="
- ssl? ( dev-libs/openssl:0= )
- readline? ( sys-libs/readline:= )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-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.0-filan-build.patch
- "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
- "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
-)
-
-pkg_setup() {
- # bug #587740
- if use readline && use ssl ; then
- elog "You are enabling both readline and openssl USE flags, the licenses"
- elog "for these packages conflict. You may not be able to legally"
- elog "redistribute the resulting binary."
- fi
-}
-
-src_prepare() {
- default
-
- touch doc/${PN}.1 || die
-
- eautoreconf
-}
-
-src_configure() {
- # bug #293324
- filter-flags -Wall '-Wno-error*'
- tc-export AR
-
- econf \
- $(use_enable ssl openssl) \
- $(use_enable readline) \
- $(use_enable ipv6 ip6) \
- $(use_enable tcpd libwrap)
-}
-
-src_install() {
- default
-
- docinto html
- dodoc doc/*.html doc/*.css
-}
next reply other threads:[~2023-05-26 9:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 9:35 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-27 7:33 [gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/ Sam James
2021-01-09 13:53 Lars Wendler
2017-01-29 9:34 Jeroen Roovers
2016-09-21 18:38 Patrick McLean
2016-09-21 18:38 Patrick McLean
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=1685093716.720d4808a276e29d61ff552cfd090a688fe0052f.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