From nobody Mon Feb 26 12:39:09 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tk0Y94QPbz5BJcS; Mon, 26 Feb 2024 12:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tk0Y93rLjz3y1b; Mon, 26 Feb 2024 12:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708951149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z79OS4Je4Vj10eovQmqBqld5zbMumBnNN/rip1CmdTw=; b=MViYjB3FtDz5cG+GKsmde3bZzPMDP/s2u4dNuHsNi2lKlDt11D6rtIek9N743/yqAZMV76 zVnwxxnLKTYqyZIoGx4BJj8dr3sA518P0vr4oA6xJYrB48KTl/iti2ega5CLBT++Y4RrDy wh5Zkhd9p8p9LNGevICvk9ixWf6vMmh1CPLThQ5bRSPv7QTg7dQTFB+C/k8LX+xf8VtzBm Ku2aqqgXBnwxxkLcafdO3FnuMSclR+K8z8gUfQHD/FqKdXjSCwz7cS2tUuUy0KN4Ys9ruj XoXA9qIZeYBaoyBvmMMR8XPLFyO89jNFX7spsUB11AGFe8zo+tyRAknHUa+7BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708951149; a=rsa-sha256; cv=none; b=BT1nrz8Rqk0W5v5YM2JEP2LXWBF3hk+AOn0LlsUh6ALgU1gFe0fFfvLfqdBdFUBb7endni LSuxS7XmpBtVkrRiOR3wroN82RWPFkzth0PljFPniW46jipPBYKQEeqpzPUclR3Z3685J2 /mLl/BgVTlyudwN3bAzKvTNt0kZXBSTcQ/pGOryi17zd8lK+VkrqU9+dh+4adzvSPyoOFN dvKHiJuNaVe2d41jy68g9l8SAOOMfaYhxliccpJXuEffjmKYMgZpSPdyCtBXdIwtPcatPk 114HY7Y4XdWoIIdABxVEYK5GKb8qFmmpmfYz3GhEiO5+/J6fTyj3fqB+1MhbWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708951149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z79OS4Je4Vj10eovQmqBqld5zbMumBnNN/rip1CmdTw=; b=DixNYvbAEMmSgUUzMAsP6ePAw3z7G0EY68u7iipPFSt1qSJUibOslM9eWy0uNafKHTboqb QgntM5307+Ebe1ZGCXM3s2jMDJH8JFleydXIrXoj2c6IdqaLdmdHE/flN2pYLbw2nOWbem 87jJjxnZSfN+k2i39qVhB37ysFDot3QHKCA9D9yknY+TFGvpT5GCcg9AOMRhlFTQc1r9Wt 1eMVyMHvUxPB6nO1znnZovRseRA/mcOHucwl6WkYu7vvy1Q838WAoPmYWOf04ZuT0uvv+K BllN2ZDJRKQCh/EhjzhkGVz9CAFHlVzN/Gz7c1QCAtWWf+lQOyFZu0x8jdQ3Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tk0Y92nMhzSgy; Mon, 26 Feb 2024 12:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QCd97k016991; Mon, 26 Feb 2024 12:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QCd9oS016988; Mon, 26 Feb 2024 12:39:09 GMT (envelope-from git) Date: Mon, 26 Feb 2024 12:39:09 GMT Message-Id: <202402261239.41QCd9oS016988@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: c3fa99245291 - main - net/dante: add missing getsockopt() interposition to fix the build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3fa9924529148735c04a0d1c8444b9942e472d3 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3fa9924529148735c04a0d1c8444b9942e472d3 commit c3fa9924529148735c04a0d1c8444b9942e472d3 Author: Alexey Dokuchaev AuthorDate: 2024-02-26 12:38:22 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-02-26 12:38:22 +0000 net/dante: add missing getsockopt() interposition to fix the build Discovered with --no-undefined-version being enabled by default in newish LLD. While here, drop CONFLICTS against `net/socks5' which was removed from the ports tree back in 2012. PR: 276938 Reported by: pkg-fallout --- net/dante/Makefile | 2 -- net/dante/files/patch-dlib_interposition.c | 31 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/net/dante/Makefile b/net/dante/Makefile index 458dbabda958..8bbb0261a7b6 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -14,8 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libminiupnpc.so:net/miniupnpc \ libsasl2.so:security/cyrus-sasl2 -CONFLICTS= socks5 - USES= libtool localbase GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share diff --git a/net/dante/files/patch-dlib_interposition.c b/net/dante/files/patch-dlib_interposition.c new file mode 100644 index 000000000000..cf6b642130d8 --- /dev/null +++ b/net/dante/files/patch-dlib_interposition.c @@ -0,0 +1,31 @@ +--- dlib/interposition.c.orig 2020-11-11 16:11:56 UTC ++++ dlib/interposition.c +@@ -1736,7 +1736,7 @@ getsockopt(s, level, optname, optval, optlen) + HAVE_PROT_GETSOCKOPT_4 optval; + HAVE_PROT_GETSOCKOPT_5 optlen; + { +- if (socks_issyscall(s, SYMBOL_GETSOCKNAME)) ++ if (socks_issyscall(s, SYMBOL_GETSOCKOPT)) + return sys_getsockopt(s, level, optname, optval, optlen); + return Rgetsockopt(s, level, optname, optval, optlen); + } +@@ -2168,6 +2168,19 @@ _getsockname(s, name, namelen) + if (socks_issyscall(s, SYMBOL_GETSOCKNAME)) + return sys_getsockname(s, name, namelen); + return Rgetsockname(s, name, namelen); ++} ++ ++HAVE_PROT_GETSOCKOPT_0 ++_getsockopt(s, level, optname, optval, optlen) ++ HAVE_PROT_GETSOCKOPT_1 s; ++ HAVE_PROT_GETSOCKOPT_2 level; ++ HAVE_PROT_GETSOCKOPT_3 optname; ++ HAVE_PROT_GETSOCKOPT_4 optval; ++ HAVE_PROT_GETSOCKOPT_5 optlen; ++{ ++ if (socks_issyscall(s, SYMBOL_GETSOCKOPT)) ++ return sys_getsockopt(s, level, optname, optval, optlen); ++ return Rgetsockopt(s, level, optname, optval, optlen); + } + + HAVE_PROT_LISTEN_0