From nobody Sun Dec 29 15:46:00 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 4YLk946HG6z5jKHq; Sun, 29 Dec 2024 15:46:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLk944tHGz4sQL; Sun, 29 Dec 2024 15:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735487160; 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=OS+YX3IRuqxzlBTQTbDX++IqFNOSg4IIaO39iOz2Chg=; b=KXbNhbUTldgvK/m8lMItg3dBPsuPHp0f/PvuwztPHnivbaUCDMQhhRVVqUdej+sTJ3Ev3+ heumn99HLbJFOLGWDFGwdddrTvonPv0uUmTPQz8CgkRvx/Y4rY1OOyaJBxMVNaljlRbzIi QOjh4cO3AyfhsiticdCDVZxB3ovAX4Ub8g1e2H00Dsuq6ZlM+yv1X63fpzeuB3csC5JVMG sHCZHiMaL82S082Yjv05GNEBGxrvYACYtBytat8qQ31ITbJURsYV3mgsDgstU84d5r/G15 OkGZMNNs8WSwZ58i0pHWVbRV+kvvoewjeaksIEJXc+iwPqPrCS5gQ+Dn7Qa8Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735487160; 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=OS+YX3IRuqxzlBTQTbDX++IqFNOSg4IIaO39iOz2Chg=; b=o//K/xRhiq+K+4Ji0mW92jqccUOZQ+hRbjQ6T11hWJz6cgsgU+J9CzvlpNgDDxKxR1HpJh QWdPRSAiX2Be++vnQCFkYmfv4TmTTgxC/5iP59zHlsSVuE6pxCb9e26a0eiQXm6dmPum3N 6xH7rnLbSPWIJ3e45+ggfUcmaVb/DlNxarUPoiy7msyLBlvwNfG9rn9x/JZ08v+PkJwTKt zVzkGO84BPHYQL/aK4oPYrn3H+L+t3RAqo8tCFC0BgD1eEWfHT1/nOuOlBMytFuyy+K56P x+6GlBQYZvyTVZMRBHV9eNzf/pXUv773UlMZDqe62Vgr/RO5+5BoZY1bowweVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735487160; a=rsa-sha256; cv=none; b=lGTuwUGwMetTLOO9DMrh8cIMqu9lvGqP7tnDjm0KD8PsNwXGbybcgjh+ooI/YuVK1JeGqQ 9Zx8ohMbIezXUux9Hi2m/MVsyncfftIpDLVPiW1IEeEPjUBP0f8D9SXKCHq8zQqxuP17UQ qAU3yeaosH1EDTYknkG5kxGwCaD3SxL4O67X+lRO4cw607OMoTx5YKIKH/h0rOyuqCkbwA nQXgcDnCGpqebZcR6pMgb0Mt25W7nPYOlhcNU42HU3si0kuEZWTdZ7ELAEWZXlCxRpg1Ro zZd5fx6jIXiXtMJb62lF1/7MujbLBLAIKLUTnqJ8lItmrxls2quhQwYd7JMMLQ== 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 4YLk944TDDzDvm; Sun, 29 Dec 2024 15:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BTFk0rx073926; Sun, 29 Dec 2024 15:46:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTFk0EM073923; Sun, 29 Dec 2024 15:46:00 GMT (envelope-from git) Date: Sun, 29 Dec 2024 15:46:00 GMT Message-Id: <202412291546.4BTFk0EM073923@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: b16b5fd495da - main - net/dante: try to unbreak the port's build on 15-CURRENT (+) 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: b16b5fd495da354af058e1be1ba3458caeb0374c Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b16b5fd495da354af058e1be1ba3458caeb0374c commit b16b5fd495da354af058e1be1ba3458caeb0374c Author: Alexey Dokuchaev AuthorDate: 2024-12-29 15:44:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-12-29 15:44:52 +0000 net/dante: try to unbreak the port's build on 15-CURRENT (+) - Due to the way this code wraps around some standard library's functions, it cannot be compiled with -D_FORTIFY_SOURCE=2, so disable the naive check in the configure script - Optionize UPnP support and remove SASL dependency for now as it does nothing alone; it could be introduced later together with proper LDAP support Reported by: pkg-fallout --- net/dante/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/net/dante/Makefile b/net/dante/Makefile index b7b2e54ed994..7e8f625bec78 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -12,12 +12,8 @@ WWW= https://www.inet.no/dante/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libminiupnpc.so:net/miniupnpc \ - libsasl2.so:security/cyrus-sasl2 - -USES= libtool localbase +USES= libtool localbase ssl GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \ --with-sockd-conf=${PREFIX}/etc/sockd.conf INSTALL_TARGET= install-strip @@ -25,7 +21,15 @@ USE_LDCONFIG= yes USE_RC_SUBR= sockd -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES UPNP +OPTIONS_DEFAULT= UPNP + +UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc +UPNP_CONFIGURE_OFF= --without-upnp + +post-patch: + @${REINPLACE_CMD} -e '/FORTIFY_SOURCE gives error/,+28d' \ + ${WRKSRC}/configure post-install: .for x in s d