From nobody Wed Nov 20 12:57:32 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 4XthGj0nWjz5djrk; Wed, 20 Nov 2024 12:57:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XthGh5qn1z4t15; Wed, 20 Nov 2024 12:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732107452; 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=c29InKZcviEEEGFlCHfckYbpo79a/YxG3NIhEbwxi4c=; b=T1E25vey3rpSR4utEh06I7FaNe989UkJUPnXWNNdV/7XwRXa3OLdidZ6fYipO7Z6G1oXo5 gX/YGxtnM0Fn2JpcZPZH7k7nbJ6DkYgABizqZ+Dy5CVWvE5P7aC+VB4VpwT3HM2yvHT2Ne 4HPv7ukZWuCvoM/q5Y7xU/SVf5ZrVIdYXokk2br1WkdKjhnKEGSFDaUx5Xd8vjr5RHLjNB WmhfH2D50bdvv+5MXXqEyc7+zCxo0pvPLETOgzxus5ouO+oV0+NjSfRmRZ30JKZV74nqsW Y4iGagZ6rFzZTikK0jF7zAMIs9SDljL1UyrJRc90+fXFGFPc5sYX2H+G/z5HRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732107452; 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=c29InKZcviEEEGFlCHfckYbpo79a/YxG3NIhEbwxi4c=; b=UxXcFF4H+TFYsfgIABOMg52BO66hHeoo5CQXLsYVCY0j3XeGG7003YgDsbTjHZ5kT0X1Yq P2dw012NgcEJA2vxw64daM3hAXkwZxz17oYBY6lfjH+sZI8gTHliiLL2pjMhM79yuUp1Dh 5amgQ45E6XUFuQmx/Qy4fSzBLfY+JBtzPaYI4jnvSZ4nmVv/fVh/f8jxFQCk75gM1CcrHD 81f52swlZ75ZMkd2Rax5ylKgG3OjfJojLFzByRlEytYx3NqNCl9nfjPakCo1H/pcv4eXpf EfRPjhVBwYyHSYxt0iZfa0yKaeYCzrWyFPVRgLI+izWWT6HZtiAGhVvorkC5KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732107452; a=rsa-sha256; cv=none; b=tshvVhLum9Iqtr2AWvHwWdIgkEi25OsF53uJZW66hgB/DwPUC3hA3EHYwGo7VEsigQ4V/Z 0/OtiWBEj6R2MDmQJzbhDaqNkdw4ip4dOES4DZtlakSqDDXT971x1uSeNb1FAIfyiuiLHc PQKzMqOlF9xlfhsVyUm54JBFVlQAI1r6ghx4r5KJmE1J1xp9+2Vmgeu/BTfx32QktE6OtI s7IflG1iTrHcpOhrjwBkhfFm2fwcOGJG0RJ8jUbaVARKmgIhvhwZkHAEo1VznCgJiHT4cl wDWNjShRqMZmxgtgAsdI5ZokK0QZoJmS47ArNP8HOMPqdl3bDrCUt7GGTk9MBg== 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 4XthGh5NBCzvZj; Wed, 20 Nov 2024 12:57:32 +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 4AKCvWrg042758; Wed, 20 Nov 2024 12:57:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AKCvWcG042755; Wed, 20 Nov 2024 12:57:32 GMT (envelope-from git) Date: Wed, 20 Nov 2024 12:57:32 GMT Message-Id: <202411201257.4AKCvWcG042755@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexander Leidinger Subject: git: a9237f43dd8c - main - devel/sonar-scanner-cli: Fix scanning on FreeBSD 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: netchild X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9237f43dd8cf111f0ca8b67e933960115adb6c6 Auto-Submitted: auto-generated The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9237f43dd8cf111f0ca8b67e933960115adb6c6 commit a9237f43dd8cf111f0ca8b67e933960115adb6c6 Author: Alexander Leidinger AuthorDate: 2024-11-20 12:53:26 +0000 Commit: Alexander Leidinger CommitDate: 2024-11-20 12:57:28 +0000 devel/sonar-scanner-cli: Fix scanning on FreeBSD - pretent to be linux (kubernetes files will still trigger an exception and abort the scan, as the kybernets part ignores the OS setting) - prevent the download of java from the sonarqube server and use the local java --- devel/sonar-scanner-cli/Makefile | 2 +- devel/sonar-scanner-cli/files/sonar-scanner.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/sonar-scanner-cli/Makefile b/devel/sonar-scanner-cli/Makefile index 5803f2b543d8..c880c791247b 100644 --- a/devel/sonar-scanner-cli/Makefile +++ b/devel/sonar-scanner-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= sonar-scanner-cli DISTVERSION= 6.2.1.4610 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel security www java MASTER_SITES= https://binaries.sonarsource.com/Distribution/${PORTNAME}/ diff --git a/devel/sonar-scanner-cli/files/sonar-scanner.in b/devel/sonar-scanner-cli/files/sonar-scanner.in index 1b72d867a5bf..8e6d1a588a9d 100644 --- a/devel/sonar-scanner-cli/files/sonar-scanner.in +++ b/devel/sonar-scanner-cli/files/sonar-scanner.in @@ -1,4 +1,4 @@ #!/bin/sh -exec /bin/sh %%PREFIX%%/%%APP_DIR%%/bin/sonar-scanner "$@" +exec /bin/sh %%PREFIX%%/%%APP_DIR%%/bin/sonar-scanner -Dsonar.scanner.os=linux -Dsonar.scanner.javaExePath=%%LOCALBASE%%/bin/java "$@"