From nobody Sat Mar 5 12:08:46 2022 X-Original-To: dev-commits-ports-branches@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 F332419F0AD1; Sat, 5 Mar 2022 12:08:46 +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 4K9k5p6DbFz4Syb; Sat, 5 Mar 2022 12:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646482126; 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=iGFge2YacFLfE8j0Qxw3UXyUav6X6q9U/MdpbXt5q5E=; b=nQqURBh7RniHD32EL0uAXrOoSXUXFBv9XOOFnae2ub3Ahroxy+H3XrFCxZb0mmEoRLVvBT J4zrh9aQHbXLHhG0mtC8mwQpC+8I1596Q87Ji8viSjda3qWjy+N/AOBwqpWi9yGbvp10F7 /s/uoGX+pBLqWiUdom2oL0t9ECyQ8xlHaTDfpjq/6Mhjr0H7qsjoXUCgn4IABoGSLaFT58 Y6fMG3PsFRCm+oYEHTR+TclBxtq9SiyhSQWhGOOu7hJFqRsdZYAb2DVbZnudn5N93WmTkQ e7MHEstpJriBPU2eYvLpMn22chbk9QxpdRMQ70FKnGmFqVRwQT01faVPO1dxjQ== 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 AC4CE2012C; Sat, 5 Mar 2022 12:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 225C8ksr088370; Sat, 5 Mar 2022 12:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 225C8k34088369; Sat, 5 Mar 2022 12:08:46 GMT (envelope-from git) Date: Sat, 5 Mar 2022 12:08:46 GMT Message-Id: <202203051208.225C8k34088369@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: e00d16832d53 - 2022Q1 - net/asterisk16: Fix build when textproc/xmlstarlet is installed List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: e00d16832d53fa4a6872eeddbc4c505e683eb5c6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646482126; 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=iGFge2YacFLfE8j0Qxw3UXyUav6X6q9U/MdpbXt5q5E=; b=qBTyxW/bdwLdrrJT8w1LtodM77R59vvJ3ZXLJJMX6mhlRVD+x8ukx/25Cr1zs1VflmnKA8 P/YDNt0FHF97ZexDdbHwTBe+BMy8dH8HE3tIzlYNF5000erd+8msBQPicR5lovaizeh683 Dpb68GNzS9ob/QD1l7bSjBawpZa6ISP4Wgax3hkaSneItUUKjA80g47Lip1ZOfLAgQIdo2 i0HQoDQBOIsBOxnKt8PRtWqTvQVzvqlb34QSHFswsOvCw1BmC+/yfFvo0DE/+g0dEO/bzp SoYsANRpnB20n1foXY7/yb4vMQKt5uDYTMbPUYJh3M/w50PKTJ/38fUcrgjjhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646482126; a=rsa-sha256; cv=none; b=EOpPHdOLuvjJXZLgGW55eEWAjsnOtKyDmZY5oIugG+LNvx9mAgvTd1Dm6kg6wTGP7coA9H sl7ixUJ7rTAVtC4erIqb1hsGldOtUlQ28htxiE+NfXy8w/DC2/U0FlWSwgqdUTcuELjbGh fDojjPh17XhSf8RiL059+qFF6DTHbb1cQpviZrubMLPYl2krYWr5TX7sGS1jhVFoaEMZpK DkHFlmIHExQdf3yk93OvpV8hCTi6BsH67SIOvOl5WxFaQLSnn+V0iAwG+/sXwB2eOn7Ek9 27/xC8XElC4rCwTIMWJT7Acq9k+mKnQbRr0wu3K83bz5BSVk9WNDRWyEqdVsjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=e00d16832d53fa4a6872eeddbc4c505e683eb5c6 commit e00d16832d53fa4a6872eeddbc4c505e683eb5c6 Author: Guido Falsi AuthorDate: 2022-02-12 14:25:52 +0000 Commit: Guido Falsi CommitDate: 2022-03-05 12:07:06 +0000 net/asterisk16: Fix build when textproc/xmlstarlet is installed Asterisk build system checks for presence of xmlstarlet as "xml" binary on the system. If found it triggers part of the build system trying to download some external files during the install phase which even uses a command line tool not available on FreeBSD. Such code is not necessary for the port, as all supported modules are downloaded using ports tree provided functionality. Furthermore downloading files from the internet is forbidden during the install phase. This patch forces the variable used by the Makefiles to identify xmlstarlet presence to be empty. so the code path described above is not triggered. PR: 261884 (cherry picked from commit f0f667985b8db89511e7caf5a37fa151f10e1cde) --- net/asterisk16/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 13cfd4632e91..423862bbf71c 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -240,6 +240,7 @@ post-extract-OPUS-on: post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample + @${REINPLACE_CMD} -e 's/@XMLSTARLET@//' ${WRKSRC}/makeopts.in .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif