From 37645465bc4f40db98e5b4a34879fbfe74c10784 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 24 Nov 2023 17:52:45 -0500 Subject: [PATCH] community/dotnet7-build: sync with aports --- community/dotnet7-build/APKBUILD | 42 +++++++++++++++---- .../runtime_76500-mono-musl-support.patch | 11 +++-- .../runtime_enable-runtime-marshalling.diff | 5 +-- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/community/dotnet7-build/APKBUILD b/community/dotnet7-build/APKBUILD index 0e43d40..99afff2 100644 --- a/community/dotnet7-build/APKBUILD +++ b/community/dotnet7-build/APKBUILD @@ -24,14 +24,38 @@ # - CVE-2023-35390 # - CVE-2023-38180 # - CVE-2023-35391 +# 7.0.111-r0: +# - CVE-2023-36792 +# - CVE-2023-36793 +# - CVE-2023-36794 +# - CVE-2023-36796 +# - CVE-2023-36799 +# 7.0.112-r0: +# - CVE-2023-36435 +# - CVE-2023-38171 +# - CVE-2023-44487 +# 7.0.113-r0: +# - CVE-2023-36792 +# - CVE-2023-36793 +# - CVE-2023-36794 +# - CVE-2023-36796 +# - CVE-2023-36799 +# - CVE-2023-44487 +# - CVE-2023-38171 +# - CVE-2023-36435 +# 7.0.114-r0: +# - CVE-2023-36049 +# - CVE-2023-36558 + pkgname=dotnet7-build -pkgver=7.0.110 +pkgver=7.0.114 pkgrel=0 _gittag=v$pkgver _giturl="https://github.com/dotnet/installer" _testtag=e1cc0f181ffd4d755756d30d985513897d592ba4 _bunnytag=v12 +_llvmver=16 _patches=" build_disable-package-validation.patch build_disable-source-link.patch @@ -52,8 +76,8 @@ pkgdesc="The .NET $_pkgver_macro bootstrap" # x86: blocked by https://github.com/dotnet/runtime/issues/77667 # armhf: blocked by https://github.com/dotnet/runtime/issues/77663 # riscv64: port WIP https://github.com/dotnet/runtime/issues/36748 -# aarch64: build failure -arch="all !x86 !armhf !riscv64 !aarch64" +# s390x | ppc64le: no diskspace / lack maintainer resources +arch="x86_64 armv7 aarch64" url=https://dotnet.microsoft.com license="MIT" # hack for dotnetx-build to be able to pull itself for bootstrapping @@ -77,7 +101,7 @@ checkdepends=" makedepends=" alpine-release bash - clang + clang$_llvmver cmake dotnet$_pkgver_name-bootstrap dotnet$_pkgver_name-bootstrap-artifacts @@ -97,7 +121,7 @@ makedepends=" libxml2-utils linux-headers lldb-dev - llvm-dev + llvm$_llvmver-dev lttng-ust-dev nodejs numactl-dev @@ -263,6 +287,8 @@ build() { ulimit -n 4096 + export PATH="$PATH:/usr/lib/llvm$_llvmver/bin" + # Disable use of LTTng as tracing on lttng <=2,13,0 is broken # See https://github.com/dotnet/runtime/issues/57784. if [ -f "/usr/lib/liblttng-ust.so.1 " ]; then @@ -542,16 +568,16 @@ doc() { } sha512sums=" -806bc8467dd23bb07d80afea00ec7973040302c509e544121bb26a308a3cc1e861a34b784d02f9ecf218acbb46fa32679c8fa56c86c04f58767c530a3592aeb6 dotnet-v7.0.110.tar.xz +ff554ad65e09b5dbce2bc617a6ed548081a2078b23f04ef7812309fe98e21303d0a090118a283cf5123c4a28690e63e3f151b364c56f8ee1e56ae6e63a4f50bc dotnet-v7.0.114.tar.xz e9f3df13d093fac214778c1137857e065f58d4e0d2a48d540d8ed7bb41e2fd73b2b3f62a0aa5b0e80fa80a5b58ba77ff19b9d10a492802f8539e3a6ed79d299d dotnet-testsuite-e1cc0f181ffd4d755756d30d985513897d592ba4.tar.gz 0028d5d97b814b122d73137b4e0d64ca5d788aa0ae5fde500de722e23522827f2538f06e75acb17cc39b8917961ee78d1f0bbc84b2b624ae0e9bf88adca2ba6f dotnet-bunny-v12.tar.gz 429033f5f6a8e33eb849c29c1d6628faca13751e1b1e536179b491041034dcdee107cbff12f7e9f1ef68a178a0818c534113f63bc8bbc37de67ec900c23cacf4 build_disable-package-validation.patch ebab0364deab5d99131e2724b7fbac668bc27ddf74958623af1913e49850df98b2d077d27324b2bbabbbcdf77ea48bf7a7ca83d0ced6f48bdb66cc1e8bbce4a4 build_disable-source-link.patch 86fbaa058f78bba100f534f4c4bd6d7254181909f70d264c0390d3dd89c878a14ba9b5d2de05271b2c07b73ead70e029488c926221f676d59e27e387e3e579e9 build_enable-timestamps.patch 4ac92d2d9190a55ee20d3e145a28a6953c98d3eb838c8acfb808b8839316443cb64da4a2c5787df0171fce7ef96ff6381043085ed90c23ec09ce9ac81571e675 roslyn-analyzer_disable-apphost.patch -7a3291a05c94986d631a37870f573aca8603e9464cb632b3e5b93eca8a358fc7dcc98a8a8017f566885ceafe462bec734b7d31c7a974270e83c6d2ae54f51902 runtime_76500-mono-musl-support.patch +b56d5053831c43b8fed48894735b9910020abbae62b2b57bc9a423cd5ef09f412025e56dd9ce1994f551b87155d682796203fd351ca7fb8a29658078a6d4b029 runtime_76500-mono-musl-support.patch d732df247c721c9f677baabdd7f36dbf4b564814ff64164361065bb1c196b767494a1d39f634eadf01a23032c7b3e64102614b7213065c81096bbf3f8022e6a0 runtime_82269-mono-thread-coop-undefine-fortify-source.patch -741d210b83d4dfca79338def253c82737b6d5f319052173f37aa6dfb5b8e90bfc29272657301095a9623ae2c72449ed6fc60cc6c70fcf88f15c66f89cbd3c201 runtime_enable-runtime-marshalling.diff +1f7be536c4826638853f110ee88bbd554be015cc88c6491c1066830789be18ad324f8ed2b1b75ed7aad74457dcafc812730059cb25d36d6344bfae8a517c00c4 runtime_enable-runtime-marshalling.diff 293742ab307bef459a21deadcc4ad7c7996cc4b490910a36c2763b8ad25cc8a91c4e03b6290567cd1030f69638d0156c5b6970887858fb091f8482b67356065d runtime_enable-system-libunwind.diff d972e77df27748a80c9b23eca12f9fbd78be97f9034b79cc5703ba58eb6750171d9a115314300f883620ccbca89c65a99ca7a45d54a421b028b590190b4bed80 runtime_remove-usage-of-off64-t.patch d1b4ebcbb1a6815fc0ce4c471485c232618e60968a879309fb8336821a9351d2e0028d9f7726c0c041c750b497a0baa47400c78c9ceff550b91b4a6c2816fc41 sdk_14239-add-zsh-compdef-completion-script.patch diff --git a/community/dotnet7-build/runtime_76500-mono-musl-support.patch b/community/dotnet7-build/runtime_76500-mono-musl-support.patch index 6f4a121..f9d2630 100644 --- a/community/dotnet7-build/runtime_76500-mono-musl-support.patch +++ b/community/dotnet7-build/runtime_76500-mono-musl-support.patch @@ -166,19 +166,18 @@ index cdff32677c0..08a82cd7e83 100644 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") set(HOST_LINUX 1) add_definitions(-D_GNU_SOURCE -D_REENTRANT) -@@ -893,6 +922,12 @@ if(HOST_IOS OR HOST_ANDROID OR HOST_MACCAT) - else() +@@ -900,6 +929,11 @@ else() set(DISABLE_DLLMAP 1) endif() -+ + +if(CLR_CMAKE_HOST_ALPINE_LINUX) + # On Alpine Linux, we need to ensure that the reported stack range for the primary thread is + # larger than the initial committed stack size. + add_definitions(-DENSURE_PRIMARY_STACK_SIZE) +endif() - ### End of OS specific checks - - include_directories("${CLR_SRC_NATIVE_DIR}") + if(TARGET_DARWIN) + check_c_compiler_flag(-fno-objc-msgsend-selector-stubs COMPILER_SUPPORTS_FNO_OBJC_MSGSEND_SELECTOR_STUBS) + if(COMPILER_SUPPORTS_FNO_OBJC_MSGSEND_SELECTOR_STUBS) diff --git a/src/runtime/src/mono/mono.proj b/src/runtime/src/mono/mono.proj index 59fea4a2f72..5bac7fdf1c6 100644 --- a/src/runtime/src/mono/mono.proj diff --git a/community/dotnet7-build/runtime_enable-runtime-marshalling.diff b/community/dotnet7-build/runtime_enable-runtime-marshalling.diff index 6b2d9d6..f609cfa 100644 --- a/community/dotnet7-build/runtime_enable-runtime-marshalling.diff +++ b/community/dotnet7-build/runtime_enable-runtime-marshalling.diff @@ -1581,7 +1581,7 @@ index 59d139c7749..a8e94e72847 100644 $(NoWarn);SYSLIB0021 diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj -index d94830c..5840638 100644 +index be33237e616..426ddb38e27 100644 --- a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -1,6 +1,6 @@ @@ -1589,9 +1589,9 @@ index d94830c..5840638 100644 - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) - $(DefineConstants);BUILDING_PKCS true true + $(NoWarn);CA5384 diff --git a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj index 8523c0d8296..2045f05a28e 100644 --- a/src/runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj @@ -1805,4 +1805,3 @@ index e7b45293318..089fe0ef33f 100644 -- 2.36.3 -