git: 799e7fccd6bc - main - lang/dotnet: Reroll bootstraps yet again

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Fri, 28 Feb 2025 09:47:38 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=799e7fccd6bcf9c333626e9aa3add65d0562477d

commit 799e7fccd6bcf9c333626e9aa3add65d0562477d
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-02-27 08:57:30 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-02-28 09:47:04 +0000

    lang/dotnet: Reroll bootstraps yet again
    
    This time the bootstraps are built in portable mode, which makes them independent
    from the OpenSSL library. This allows us to use a single bootstrap per arch again
    and also supports the SSL_DEFAULT != base case.
    
    Thanks to Szczepan Ćwikliński <sec@thinkcode.pl> for providing the AArch64 bootstrap.
---
 lang/dotnet/Makefile  | 15 +++++++--------
 lang/dotnet/distinfo  | 26 +++++++++-----------------
 lang/dotnet/pkg-plist |  4 ----
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/lang/dotnet/Makefile b/lang/dotnet/Makefile
index c6dc65f21b09..90ed3c56e7c3 100644
--- a/lang/dotnet/Makefile
+++ b/lang/dotnet/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	dotnet
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${DOTNETVERSION}.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	https://github.com/dotnet/dotnet/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/release.json?dummy=/:dotnetmanifest \
-		https://github.com/sec/dotnet-core-freebsd-source-build/releases/download/9.0.100-vmr/:bootstrap
+		https://github.com/sec/dotnet-core-freebsd-source-build/releases/download/${SDKVERSION}-vmr/:bootstrap
 DISTFILES=	release.json-${PORTVERSION}:dotnetmanifest \
 		${BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}:bootstrap \
 		${BOOTSTRAP_SDK_DISTNAME}${EXTRACT_SUFX}:bootstrap
@@ -42,8 +42,9 @@ BINARY_ALIAS=	grep=${LOCALBASE}/bin/ggrep
 DOTNET_ENV=	PYTHON=${PYTHON_CMD}
 
 BOOTSTRAP_DOTNETVERSION=			9.0
-BOOTSTRAP_SDKVERSION=				${BOOTSTRAP_DOTNETVERSION}.100
-BOOTSTRAP_SDKVERSIONSUFFIX=			-rtm.24529.1
+BOOTSTRAP_SDKVERSION=				${BOOTSTRAP_DOTNETVERSION}.103
+BOOTSTRAP_SDKVERSIONSUFFIX=			-servicing.25071.1
+BOOTSTRAP_SDK_RID=				freebsd-${DOTNET_ARCH}
 BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME=	Private.SourceBuilt.Artifacts.${BOOTSTRAP_SDKVERSION}${BOOTSTRAP_SDKVERSIONSUFFIX}.${BOOTSTRAP_SDK_RID}
 BOOTSTRAP_SDK_DISTNAME=				dotnet-sdk-${BOOTSTRAP_SDKVERSION}-${BOOTSTRAP_SDK_RID}
 
@@ -77,10 +78,8 @@ PLIST_SUB+=	NONPORTABLE=
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-base-openssl
 .endif
 
-.if ${OSVERSION} < 1400000
-BOOTSTRAP_SDK_RID=	freebsd.13-${DOTNET_ARCH}
-.else
-BOOTSTRAP_SDK_RID=	freebsd.14-${DOTNET_ARCH}
+.if ${OSVERSION} >= 1400000
+BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libssl.so.111:misc/compat13x
 .endif
 
 .if ${ARCH} == amd64
diff --git a/lang/dotnet/distinfo b/lang/dotnet/distinfo
index a311483cf07b..3a9794ac67af 100644
--- a/lang/dotnet/distinfo
+++ b/lang/dotnet/distinfo
@@ -1,21 +1,13 @@
-TIMESTAMP = 1739433297
+TIMESTAMP = 1740646433
 SHA256 (dotnet/release.json-9.0.2) = 8746d7855beaeca19a7c3ddbc6a690a9c3ec5432df5db47314c8aaac7726d6d6
 SIZE (dotnet/release.json-9.0.2) = 273
 SHA256 (dotnet/dotnet-dotnet-v9.0.2_GH0.tar.gz) = 1cafd3d650734383f0018f8a65f43f4c943c69ab8fc300cb41b9ae8fd6b5266a
 SIZE (dotnet/dotnet-dotnet-v9.0.2_GH0.tar.gz) = 494550082
-SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.100-rtm.24529.1.freebsd.13-x64.tar.gz) = e97101b76488b11c8ef83fc7fa73076399100a8a29738fddc2d244cbda48eb06
-SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.100-rtm.24529.1.freebsd.13-x64.tar.gz) = 834353416
-SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.100-rtm.24529.1.freebsd.13-arm64.tar.gz) = 13e6ee3a5cb7b6b8e45c862161142a4cfc9cbeb0f57c94dfb492b34bb05353af
-SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.100-rtm.24529.1.freebsd.13-arm64.tar.gz) = 824468584
-SHA256 (dotnet/dotnet-sdk-9.0.100-freebsd.13-x64.tar.gz) = dbf63c98b7215a63e02e565fe667aed50ed1799aee8bcfa5506aa2a6253229f1
-SIZE (dotnet/dotnet-sdk-9.0.100-freebsd.13-x64.tar.gz) = 511313224
-SHA256 (dotnet/dotnet-sdk-9.0.100-freebsd.13-arm64.tar.gz) = b9b0a9cb6ce56d7915367cd0ceb80deda7e6db09d2623898452f61b8c973ee1d
-SIZE (dotnet/dotnet-sdk-9.0.100-freebsd.13-arm64.tar.gz) = 501952215
-SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.100-rtm.24529.1.freebsd.14-x64.tar.gz) = ba0470a1d889129505085264fb5f2b4a8e3cb07f13d61ec7b3a7f1101379feca
-SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.100-rtm.24529.1.freebsd.14-x64.tar.gz) = 833256591
-SHA256 (dotnet/dotnet-sdk-9.0.100-freebsd.14-x64.tar.gz) = 525e4adefabfb9d394cef31779acdde573fe6ba74a957e77194a4ebbaba7fe4c
-SIZE (dotnet/dotnet-sdk-9.0.100-freebsd.14-x64.tar.gz) = 510594725
-SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.100-rtm.24529.1.freebsd.14-arm64.tar.gz) = 3d0425624c537d7c81997023a1f29efe00963152e229b081ee50cf583e68f9c3
-SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.100-rtm.24529.1.freebsd.14-arm64.tar.gz) = 824214925
-SHA256 (dotnet/dotnet-sdk-9.0.100-freebsd.14-arm64.tar.gz) = 611e2d3c8a2f74cb5347c4368809bb22f50c4be5af7ba529459750e17a2ac70b
-SIZE (dotnet/dotnet-sdk-9.0.100-freebsd.14-arm64.tar.gz) = 501948598
+SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.103-servicing.25071.1.freebsd-arm64.tar.gz) = 8dd55906bd75de83cad9c6b257cbe772cf23413c3a2caee913cde7398c1a0622
+SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.103-servicing.25071.1.freebsd-arm64.tar.gz) = 827383751
+SHA256 (dotnet/dotnet-sdk-9.0.103-freebsd-arm64.tar.gz) = 04027a151f981dc948f3f93fca0c8a88c3de9c18d709f61c91105af8abeb3196
+SIZE (dotnet/dotnet-sdk-9.0.103-freebsd-arm64.tar.gz) = 504643018
+SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.103-servicing.25071.1.freebsd-x64.tar.gz) = 307bba6133c8c247f014553676663da26b82a0a8a8db7940c131d1b00772853b
+SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.103-servicing.25071.1.freebsd-x64.tar.gz) = 837219995
+SHA256 (dotnet/dotnet-sdk-9.0.103-freebsd-x64.tar.gz) = cab6accdf9fc926c6f4e231caa13d2075ba9b3584708e08cc08c05c0d0e42fd6
+SIZE (dotnet/dotnet-sdk-9.0.103-freebsd-x64.tar.gz) = 513941299
diff --git a/lang/dotnet/pkg-plist b/lang/dotnet/pkg-plist
index edf1c65c3591..718978fef204 100644
--- a/lang/dotnet/pkg-plist
+++ b/lang/dotnet/pkg-plist
@@ -1637,7 +1637,6 @@
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-format/BuildHost-netcore/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll.config
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-format/BuildHost-netcore/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.runtimeconfig.json
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-format/BuildHost-netcore/Newtonsoft.Json.dll
-%%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-format/BuildHost-netcore/System.Collections.Immutable.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-format/BuildHost-netcore/System.CommandLine.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-format/BuildHost-netcore/cs/System.CommandLine.resources.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-format/BuildHost-netcore/de/System.CommandLine.resources.dll
@@ -1915,7 +1914,6 @@
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-watch/%%SDKVERSION%%%%SDKSERVICESUFFIX%%/tools/net%%DOTNETVERSION%%/any/BuildHost-netcore/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll.config
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-watch/%%SDKVERSION%%%%SDKSERVICESUFFIX%%/tools/net%%DOTNETVERSION%%/any/BuildHost-netcore/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.runtimeconfig.json
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-watch/%%SDKVERSION%%%%SDKSERVICESUFFIX%%/tools/net%%DOTNETVERSION%%/any/BuildHost-netcore/Newtonsoft.Json.dll
-%%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-watch/%%SDKVERSION%%%%SDKSERVICESUFFIX%%/tools/net%%DOTNETVERSION%%/any/BuildHost-netcore/System.Collections.Immutable.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-watch/%%SDKVERSION%%%%SDKSERVICESUFFIX%%/tools/net%%DOTNETVERSION%%/any/BuildHost-netcore/System.CommandLine.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-watch/%%SDKVERSION%%%%SDKSERVICESUFFIX%%/tools/net%%DOTNETVERSION%%/any/BuildHost-netcore/cs/System.CommandLine.resources.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/DotnetTools/dotnet-watch/%%SDKVERSION%%%%SDKSERVICESUFFIX%%/tools/net%%DOTNETVERSION%%/any/BuildHost-netcore/de/System.CommandLine.resources.dll
@@ -2425,8 +2423,6 @@
 %%DATADIR%%/sdk/%%SDKVERSION%%/Roslyn/bincore/Microsoft.CodeAnalysis.CSharp.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/Roslyn/bincore/Microsoft.CodeAnalysis.VisualBasic.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/Roslyn/bincore/Microsoft.CodeAnalysis.dll
-%%DATADIR%%/sdk/%%SDKVERSION%%/Roslyn/bincore/System.Collections.Immutable.dll
-%%DATADIR%%/sdk/%%SDKVERSION%%/Roslyn/bincore/System.Reflection.Metadata.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/Roslyn/bincore/VBCSCompiler.deps.json
 %%DATADIR%%/sdk/%%SDKVERSION%%/Roslyn/bincore/VBCSCompiler.dll
 %%DATADIR%%/sdk/%%SDKVERSION%%/Roslyn/bincore/VBCSCompiler.runtimeconfig.json