commit: b1874260ac537e9747e2b9e79a2542f9998293a7 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Wed Oct 5 08:57:54 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Oct 5 11:51:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1874260
net-analyzer/netcat: fix for -Werror=implicit-int This change patches the issue for clang-16 where -Werror=implicit-int is used by default among others. The patch was crafted specifically for us. Closes: https://bugs.gentoo.org/871003 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/27633 Signed-off-by: Sam James <sam <AT> gentoo.org> .../netcat-110.20180111-variadic-holler.patch | 88 ++++++++++++++++++++++ net-analyzer/netcat/netcat-110.20180111-r2.ebuild | 66 ++++++++++++++++ 2 files changed, 154 insertions(+) diff --git a/net-analyzer/netcat/files/netcat-110.20180111-variadic-holler.patch b/net-analyzer/netcat/files/netcat-110.20180111-variadic-holler.patch new file mode 100644 index 000000000000..36fda8614eef --- /dev/null +++ b/net-analyzer/netcat/files/netcat-110.20180111-variadic-holler.patch @@ -0,0 +1,88 @@ +Subject: [PATCH] Convert holler and bail to variadic function + +Both functions usually consume different types than char * which is +problematic for some compliers like clang-16 where -Werror=implicit-int +is enabled by default. + +The fix is done in such a way that original holler function is converted +to vholer which uses va_list from stdarg.h and holler and bail are +converted to variadic functions that utilize vholler for printing. + +Bug: https://bugs.gentoo.org/871003 + +diff --git a/netcat.c b/netcat.c +index 992c42b..b4d6fd8 100644 +--- a/netcat.c ++++ b/netcat.c +@@ -80,6 +80,7 @@ + #include <signal.h> + #include <fcntl.h> /* O_WRONLY et al */ + #include <unistd.h> ++#include <stdarg.h> + + /* handy stuff: */ + #define SA struct sockaddr /* socket overgeneralization braindeath */ +@@ -215,23 +216,18 @@ int o_quit = -1; /* 0 == quit-now; >0 == quit after o_quit seconds */ + /* support routines -- the bulk of this thing. Placed in such an order that + we don't have to forward-declare anything: */ + +-/* holler : +- fake varargs -- need to do this way because we wind up calling through +- more levels of indirection than vanilla varargs can handle, and not all +- machines have vfprintf/vsyslog/whatever! 6 params oughta be enough. */ +-void holler (str, p1, p2, p3, p4, p5, p6) +- char * str; +- char * p1, * p2, * p3, * p4, * p5, * p6; ++/* vholler : */ ++void vholler(const char * str, va_list ap) + { + FILE *o_holler_out = (o_holler_stderr ? stderr : stdout); + if (o_verbose) { +- fprintf (o_holler_out, str, p1, p2, p3, p4, p5, p6); ++ vfprintf (o_holler_out, str, ap); + #ifdef HAVE_BIND + if (h_errno) { /* if host-lookup variety of error ... */ + if (h_errno > 4) /* oh no you don't, either */ + fprintf (o_holler_out, "preposterous h_errno: %d", h_errno); + else +- fprintf (o_holler_out, h_errs[h_errno]); /* handle it here */ ++ fputs (h_errs[h_errno], o_holler_out); /* handle it here */ + h_errno = 0; /* and reset for next call */ + } + #endif +@@ -241,16 +237,27 @@ void holler (str, p1, p2, p3, p4, p5, p6) + fprintf (o_holler_out, "\n"); + fflush (o_holler_out); + } +-} /* holler */ ++} /* vholler */ ++ ++void holler(const char * fmt, ...) ++{ ++ va_list ap; ++ va_start(ap, fmt); ++ vholler(fmt, ap); ++ va_end(ap); ++} + + /* bail : + error-exit handler, callable from anywhere */ +-void bail (str, p1, p2, p3, p4, p5, p6) +- char * str; +- char * p1, * p2, * p3, * p4, * p5, * p6; ++void bail (const char * fmt, ...) + { + o_verbose = 1; +- holler (str, p1, p2, p3, p4, p5, p6); ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vholler(fmt, ap); ++ va_end(ap); ++ + close (netfd); + exit (1); + } /* bail */ +-- +2.35.1 + diff --git a/net-analyzer/netcat/netcat-110.20180111-r2.ebuild b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild new file mode 100644 index 000000000000..1818338b51ac --- /dev/null +++ b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +MY_P="nc${PV}" +DESCRIPTION="The network swiss army knife" +HOMEPAGE="https://nc110.sourceforge.io"; +SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz" +S="${WORKDIR}/nc110" + +LICENSE="netcat" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris" +IUSE="ipv6 static" + +PATCHES=( + "${FILESDIR}/${P}-variadic-holler.patch" +) + +src_prepare() { + default + + sed -i \ + -e '/#define HAVE_BIND/s:#define:#undef:' \ + -e '/#define FD_SETSIZE 16/s:16:1024: #34250' \ + netcat.c || die + + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c || die + fi +} + +src_configure() { + if ! use ipv6 ; then + sed -i '/#define INET6/d' generic.h || die + fi + + append-cppflags -DTELNET -DGAPING_SECURITY_HOLE +} + +src_compile() { + local xlibs + + [[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket" + + emake \ + LD="$(tc-getCC) ${LDFLAGS}" \ + DFLAGS="${CPPFLAGS}" \ + XFLAGS="${CFLAGS}" \ + STATIC=$(usex static '-static' '') \ + XLIBS="${xlibs}" \ + nc +} + +src_install() { + dobin nc + + dodoc README* netcat.blurb + doman nc.1 + + docinto scripts + dodoc scripts/* +}
