From nobody Sat Mar 5 12:08:49 2022 X-Original-To: dev-commits-ports-all@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 955FA19F0876; Sat, 5 Mar 2022 12:08:50 +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 4K9k5t2GWMz4SjX; Sat, 5 Mar 2022 12:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646482130; 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=R6np+gpCV6kX/Dv9b8qecRgvKEhMjDZusYKhqi+zgxc=; b=U8QpWwXNTnzttu+MsPr4DvdFyxfiG+ispnmCl063S440lXO7Ca6C8UMPA5tzw8gddPRAyA dDS36O+7LR3JV7ZXOExZqTt4uHcKdyACm8w3ziVLbrYbeSmuXU+x5CnmnHEfkHW2aLCRYs Cp5CA5DpMg9JY2R42TWJq5LMoymxiEIbdAch31rB58uHbCkf4YaLaY8tdfIapjeDANZae1 q/+kk/xvt7pOnr69rwxuuHuFqVgXiYdznhYGjqQEgcoCdepRJHkkXeDlSEQiU8VB2RQ6GF FN6eA4eM2GkJJC0xPAxYAG+RbW9OrciHh+Ktks5GtdZEeyCfHUt5w/jgjbH5zw== 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 13328200A5; Sat, 5 Mar 2022 12:08:50 +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 225C8nND088449; Sat, 5 Mar 2022 12:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 225C8nK5088448; Sat, 5 Mar 2022 12:08:49 GMT (envelope-from git) Date: Sat, 5 Mar 2022 12:08:49 GMT Message-Id: <202203051208.225C8nK5088448@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: 17ade4ed2f18 - 2022Q1 - net/asterisk18: Fix build when textproc/xmlstarlet is installed List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 17ade4ed2f181515f7516573328ebbd245bb3964 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646482130; 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=R6np+gpCV6kX/Dv9b8qecRgvKEhMjDZusYKhqi+zgxc=; b=JJBqOjHoK78fJUrXdBW+9YoXjUSQ1UbNByUfPhnpJ2ijD/AH/qiLlZmih3wu+vxsLL/YBR iSoPT6WeTn4OuHeS/mjpGmHr9hXhhiwG2zOFV5Ns9SRrYnJkY9WyQb8goGtwLT2ZGNOLTv ukskmb1GV/OqxhreQDSOcHjZcu/cVqALQuZAR+4CTv96tGiKKp07qpXw0ghJS4t2XPefHo W5jCEpwdXi+MaZVqugVwUe4qo1+18sKc7fwfVsyUc+YFGbaXsSDo0Sn9fXgwTA5o/G+ABG VCHFSVMCx1OqeOkgw1RZKfRC6KUWUqceu0AdyFT10ss+Yf4Duze5poU3r6qC1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646482130; a=rsa-sha256; cv=none; b=WTLBpfi9yv7NYKTPMUxJieSGxZFpKNlt19/mezsex24YBc0gVlAf84cZJt6KwucYKHtc2I 1PcrRcRd5jbIerPrit4tB3s4KsaBWjvQu4rB65BADQuFxSb0rhyiH6rtK0YBX403C8QJHO cyI6FSRP1zH+DcHUc/x1eNm5KcsCwzcqGizpr9OIedYgQ2rYv0tXlmLTu6kYvooXC1xgU1 7nqjpkdrWG9mbOr76nVMKljnsa+vRnwZXbzWC2aNrain306HARdpMII3NmdHv9rZv7oXPz kOBvmP5B3BG5Op1S4gQ0AWbBR+ULImN/iUmU7RSfIhyeFcIxuSOphekT0+bv7g== 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=17ade4ed2f181515f7516573328ebbd245bb3964 commit 17ade4ed2f181515f7516573328ebbd245bb3964 Author: Guido Falsi AuthorDate: 2022-02-12 14:26:59 +0000 Commit: Guido Falsi CommitDate: 2022-03-05 12:08:10 +0000 net/asterisk18: 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 9267d1fb2f64b42c306d51453d71cdf4ca5ecf6b) --- net/asterisk18/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 6994a0ba002a..87531fafcc95 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/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