Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
eabdullin
|
8a9360c2be |
|
|
@ -0,0 +1,4 @@
|
|||
35100bcbe91362f5686caf6ebb55bd32215b813b SOURCES/dotnet-prebuilts-8.0.100-preview.6.23330.14-arm64.tar.gz
|
||||
de9624deab87fb323f87fceabacbfbf8b1d088c0 SOURCES/dotnet-prebuilts-8.0.100-preview.6.23330.14-ppc64le.tar.gz
|
||||
bc43d99e7b7faa8fde7e57faf4d46d17d00aadf8 SOURCES/dotnet-prebuilts-8.0.100-preview.6.23330.14-s390x.tar.gz
|
||||
fd142a9cc8993cde3389ce8073d1f0101a6d76b0 SOURCES/dotnet-v8.0.0-preview.7.23375.6-x64-bootstrap.tar.xz
|
||||
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
|
|
@ -1,46 +1,4 @@
|
|||
/dotnet-v3.1.101-SDK.tar.gz
|
||||
/dotnet-v3.1.102-SDK.tar.gz
|
||||
/dotnet-v3.1.103.2-SDK.tar.gz
|
||||
/dotnet-v5.0.102-SDK-arm64-bootstrap.tar.gz
|
||||
/dotnet-v5.0.102-SDK-x64-bootstrap.tar.gz
|
||||
/dotnet-v5.0.102-SDK.tar.gz
|
||||
/dotnet-v5.0.103-SDK.tar.gz
|
||||
/dotnet-v5.0.104-SDK.tar.gz
|
||||
/dotnet-v5.0.202-SDK.tar.gz
|
||||
/dotnet-v5.0.203-SDK.tar.gz
|
||||
/dotnet-v5.0.204-SDK.tar.gz
|
||||
/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c-x64-bootstrap.tar.xz
|
||||
/dotnet-arm64-prebuilts-2021-10-29.tar.gz
|
||||
/dotnet-s390x-prebuilts-2021-10-29.tar.gz
|
||||
/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz
|
||||
/dotnet-v6.0.101.tar.gz
|
||||
/dotnet-v6.0.102.tar.gz
|
||||
/dotnet-v6.0.103.tar.gz
|
||||
/dotnet-v6.0.104.tar.gz
|
||||
/dotnet-v6.0.105.tar.gz
|
||||
/dotnet-v7.0.100-rc.2.22477.23-x64-bootstrap.tar.xz
|
||||
/dotnet-arm64-prebuilts-2022-10-12.tar.gz
|
||||
/dotnet-ppc64le-prebuilts-2022-10-21.tar.gz
|
||||
/dotnet-s390x-prebuilts-2022-10-12.tar.gz
|
||||
/dotnet-v7.0.100.tar.gz
|
||||
/dotnet-v7.0.101.tar.gz
|
||||
/dotnet-v7.0.102.tar.gz
|
||||
/dotnet-v8.0.0-preview.7.23375.6-x64-bootstrap.tar.xz
|
||||
/dotnet-prebuilts-8.0.100-preview.6.23330.14-arm64.tar.gz
|
||||
/dotnet-prebuilts-8.0.100-preview.6.23330.14-ppc64le.tar.gz
|
||||
/dotnet-prebuilts-8.0.100-preview.6.23330.14-s390x.tar.gz
|
||||
/dotnet-v8.0.0-rc.1.23419.4-x64-bootstrap.tar.xz
|
||||
/dotnet-prebuilts-8.0.100-rc.1.23410.12-arm64.tar.gz
|
||||
/dotnet-prebuilts-8.0.100-rc.1.23410.12-ppc64le.tar.gz
|
||||
/dotnet-prebuilts-8.0.100-rc.1.23410.12-s390x.tar.gz
|
||||
/dotnet-v8.0.0-rc.1.23419.4.tar.gz
|
||||
/dotnet-v8.0.0-rc.2.23479.6.tar.gz
|
||||
/dotnet-v8.0.0.tar.gz
|
||||
/dotnet-v8.0.1.tar.gz
|
||||
/dotnet-v8.0.2.tar.gz
|
||||
/dotnet-8.0.3.tar.gz
|
||||
/dotnet-8.0.3.tar.gz.sig
|
||||
/dotnet-8.0.4.tar.gz
|
||||
/dotnet-8.0.4.tar.gz.sig
|
||||
/dotnet-8.0.5.tar.gz
|
||||
/dotnet-8.0.5.tar.gz.sig
|
||||
SOURCES/dotnet-prebuilts-8.0.100-preview.6.23330.14-arm64.tar.gz
|
||||
SOURCES/dotnet-prebuilts-8.0.100-preview.6.23330.14-ppc64le.tar.gz
|
||||
SOURCES/dotnet-prebuilts-8.0.100-preview.6.23330.14-s390x.tar.gz
|
||||
SOURCES/dotnet-v8.0.0-preview.7.23375.6-x64-bootstrap.tar.xz
|
||||
|
|
|
|||
140
README.md
140
README.md
|
|
@ -1,140 +0,0 @@
|
|||
# dotnet8.0
|
||||
|
||||
This is the work in progress .NET 8.0 package for Fedora.
|
||||
|
||||
Builds for Fedora, CentOS Stream and RHEL are available from
|
||||
https://copr.fedorainfracloud.org/coprs/g/dotnet-sig/dotnet-preview/
|
||||
|
||||
This package is maintained by the Fedora DotNet SIG (Special Interest
|
||||
Group). You can find out more about the DotNet SIG at:
|
||||
|
||||
- https://fedoraproject.org/wiki/SIGs/DotNet
|
||||
- https://fedoraproject.org/wiki/DotNet
|
||||
- https://lists.fedoraproject.org/archives/list/dotnet-sig@lists.fedoraproject.org/
|
||||
|
||||
Please report any issues [using
|
||||
bugzilla](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=dotnet7.0).
|
||||
|
||||
# Specification
|
||||
|
||||
This package follows [package naming and contents suggested by
|
||||
upstream](https://docs.microsoft.com/en-us/dotnet/core/build/distribution-packaging),
|
||||
with one exception. It installs dotnet to `/usr/lib64/dotnet` (aka
|
||||
`%{_libdir}`).
|
||||
|
||||
# Contributing
|
||||
|
||||
The steps below are for the final package. Please only contribute to this
|
||||
pre-release version this if you know what you are doing. Original instructions
|
||||
follow.
|
||||
|
||||
## General Changes
|
||||
|
||||
1. Fork the repo.
|
||||
|
||||
2. Checkout the forked repository.
|
||||
|
||||
- `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet7.0.git`
|
||||
- `cd dotnet7.0`
|
||||
|
||||
3. Make your changes. Don't forget to add a changelog.
|
||||
|
||||
4. Do local builds.
|
||||
|
||||
- `fedpkg local`
|
||||
|
||||
5. Fix any errors that come up and rebuild until it works locally.
|
||||
|
||||
6. Do builds in koji.
|
||||
|
||||
- `fedpkg scratch-build --srpm`
|
||||
|
||||
8. Commit the changes to the git repo.
|
||||
|
||||
- `git add` any new patches
|
||||
- `git remove` any now-unnecessary patches
|
||||
- `git commit -a`
|
||||
- `git push`
|
||||
|
||||
9. Create a pull request with your changes.
|
||||
|
||||
10. Once the tests in the pull-request pass, and reviewers are happy, do a real
|
||||
build.
|
||||
|
||||
- `fedpkg build`
|
||||
|
||||
11. For non-rawhide releases, file updates using bodhi to ship the just-built
|
||||
package out to users.
|
||||
|
||||
- https://bodhi.fedoraproject.org/updates/new
|
||||
|
||||
OR
|
||||
|
||||
- `fedpkg update`
|
||||
|
||||
## Updating to an new upstream release
|
||||
|
||||
1. Fork the repo.
|
||||
|
||||
2. Checkout the forked repository.
|
||||
|
||||
- `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet7.0.git`
|
||||
- `cd dotnet7.0`
|
||||
|
||||
3. Build the new upstream source tarball. Update the versions in the
|
||||
spec file. Add a changelog. This is generally automated by the
|
||||
following.
|
||||
|
||||
- `./update-release <sdk-version> <runtime-version>`
|
||||
|
||||
If this fails because of compiler errors, you might have to figure
|
||||
out a fix, then add the patch in `build-dotnet-tarball` script
|
||||
rather than the spec file.
|
||||
|
||||
4. Do local builds.
|
||||
|
||||
- `fedpkg local`
|
||||
|
||||
5. Fix any errors that come up and rebuild until it works locally. Any
|
||||
patches that are needed at this point should be added to the spec file.
|
||||
|
||||
6. Do builds in koji.
|
||||
|
||||
- `fedpkg scratch-build --srpm`
|
||||
|
||||
7. Upload the source archive to the Fedora look-aside cache.
|
||||
|
||||
- `fedpkg new-sources path-to-generated-dotnet-source-tarball.tar.gz`
|
||||
|
||||
8. Commit the changes to the git repo.
|
||||
|
||||
- `git add` any new patches
|
||||
- `git remove` any now-unnecessary patches
|
||||
- `git commit -a`
|
||||
- `git push`
|
||||
|
||||
9. Create a pull request with your changes.
|
||||
|
||||
10. Once the tests in the pull-request pass, and reviewers are happy, do a real
|
||||
build.
|
||||
|
||||
- `fedpkg build`
|
||||
|
||||
11. For non-rawhide releases, file updates using bodhi to ship the just-built
|
||||
package out to users.
|
||||
|
||||
- https://bodhi.fedoraproject.org/updates/new
|
||||
|
||||
OR
|
||||
|
||||
- `fedpkg update`
|
||||
|
||||
# Testing
|
||||
|
||||
This package uses CI tests as defined in `tests/test.yml`. Creating a
|
||||
pull-request or running a build will fire off tests and flag any issues. We have
|
||||
enabled gating (via `gating.yaml`) on the tests. That prevents a build
|
||||
that fails any test from being released until the failures are waived.
|
||||
|
||||
The tests themselves are contained in this external repository:
|
||||
https://github.com/redhat-developer/dotnet-regular-tests/
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
From 02f6303d86672997ec2e6b79b16d5ddbf52118a0 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Deseyn <tom.deseyn@gmail.com>
|
||||
Date: Tue, 22 Aug 2023 14:52:36 +0200
|
||||
Subject: [PATCH] Avoid loading System.Security.Permissions.
|
||||
|
||||
source-built Mono fails to load types from this assembly.
|
||||
---
|
||||
src/msbuild/src/Shared/ExceptionHandling.cs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/msbuild/src/Shared/ExceptionHandling.cs b/src/msbuild/src/Shared/ExceptionHandling.cs
|
||||
index a7ef74e873..3dce645df1 100644
|
||||
--- a/src/msbuild/src/Shared/ExceptionHandling.cs
|
||||
+++ b/src/msbuild/src/Shared/ExceptionHandling.cs
|
||||
@@ -167,7 +167,7 @@ internal static bool IsIoRelatedException(Exception e)
|
||||
internal static bool IsXmlException(Exception e)
|
||||
{
|
||||
return e is XmlException
|
||||
- || e is XmlSyntaxException
|
||||
+ // || e is XmlSyntaxException
|
||||
|| e is XmlSchemaException
|
||||
|| e is UriFormatException; // XmlTextReader for example uses this under the covers
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"release": "8.0.0-preview.7",
|
||||
"channel": "8.0",
|
||||
"tag": "v8.0.0-preview.7.23375.6",
|
||||
"sdkVersion": "8.0.100-preview.7.23376.3",
|
||||
"runtimeVersion": "8.0.0-preview.7.23375.6",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "a4e1c155baee463805c5af89adb4cb1165df9ad0"
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
%bcond_with bootstrap
|
||||
%bcond_without bootstrap
|
||||
|
||||
# LTO triggers a compilation error for a source level issue. Given that LTO should not
|
||||
# change the validity of any given source and the nature of the error (undefined enum), I
|
||||
|
|
@ -8,21 +8,22 @@
|
|||
|
||||
%global dotnetver 8.0
|
||||
|
||||
%global host_version 8.0.5
|
||||
%global runtime_version 8.0.5
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 8.0.105
|
||||
%global host_version 8.0.0-preview.7.23375.6
|
||||
%global runtime_version 8.0.0-preview.7.23375.6
|
||||
%global aspnetcore_runtime_version 8.0.0-preview.7.23375.9
|
||||
%global sdk_version 8.0.100-preview.7.23376.1
|
||||
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
||||
%global templates_version %{runtime_version}
|
||||
%global templates_version 8.0.0-preview.7.23375.9
|
||||
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
||||
|
||||
%global upstream_tag v%{runtime_version}
|
||||
# upstream can update releases without revving the SDK version so these don't always match
|
||||
%global upstream_tag v8.0.0-preview.7.23375.6
|
||||
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
|
||||
|
||||
%global host_rpm_version %{host_version}
|
||||
%global runtime_rpm_version %{runtime_version}
|
||||
%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
|
||||
%global sdk_rpm_version %{sdk_version}
|
||||
%global host_rpm_version 8.0.0~preview.7
|
||||
%global runtime_rpm_version 8.0.0~preview.7
|
||||
%global aspnetcore_runtime_rpm_version 8.0.0~preview.7
|
||||
%global sdk_rpm_version 8.0.100~preview.7
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||
%global use_bundled_libunwind 0
|
||||
|
|
@ -47,20 +48,20 @@
|
|||
%global runtime_arch x64
|
||||
%endif
|
||||
|
||||
%global mono_archs ppc64le s390x
|
||||
%global mono_archs s390x ppc64le
|
||||
|
||||
%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}}
|
||||
|
||||
Name: dotnet%{dotnetver}
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 2%{?dist}
|
||||
Release: 0.2%{?dist}
|
||||
Summary: .NET Runtime and SDK
|
||||
License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib
|
||||
|
||||
URL: https://github.com/dotnet/
|
||||
|
||||
%if %{with bootstrap}
|
||||
%global bootstrap_sdk_version 8.0.100-rc.1.23410.12
|
||||
%global bootstrap_sdk_version 8.0.100-preview.6.23330.14
|
||||
%global tarball_name dotnet-%{upstream_tag}-x64-bootstrap
|
||||
# The source is generated on a Fedora box via:
|
||||
# ./build-dotnet-tarball --bootstrap %%{upstream_tag}
|
||||
|
|
@ -72,12 +73,16 @@ Source2: dotnet-prebuilts-%{bootstrap_sdk_version}-ppc64le.tar.gz
|
|||
# Generated manually, same pattern as the arm64 tarball
|
||||
Source3: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz
|
||||
%else
|
||||
Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz
|
||||
Source1: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz.sig
|
||||
Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc
|
||||
# For non-releases, the source is generated on a Fedora box via:
|
||||
# ./build-dotnet-tarball %%{upstream_tag} or commit
|
||||
%global tarball_name dotnet-sdk-source-%{upstream_tag}
|
||||
Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag}.tar.gz
|
||||
%endif
|
||||
Source5: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json
|
||||
|
||||
#Source10: %%{tarball_name}-nm-dev.tgz
|
||||
#Source11: %%{tarball_name}-nm-prod.tgz
|
||||
|
||||
Source20: check-debug-symbols.py
|
||||
Source21: dotnet.sh.in
|
||||
|
||||
|
|
@ -85,18 +90,14 @@ Source21: dotnet.sh.in
|
|||
Patch1: roslyn-analyzers-ppc64le-apphost.patch
|
||||
# https://github.com/dotnet/source-build/discussions/3481
|
||||
Patch2: vstest-intent-net8.0.patch
|
||||
# https://github.com/dotnet/runtime/pull/95216#issuecomment-1842799314
|
||||
Patch3: runtime-re-enable-implicit-rejection.patch
|
||||
# https://github.com/dotnet/msbuild/pull/9449
|
||||
Patch4: msbuild-9449-exec-stop-setting-a-locale.patch
|
||||
# We disable checking the signature of the last certificate in a chain if the certificate is supposedly self-signed.
|
||||
# A side effect of not checking the self-signature of such a certificate is that disabled or unsupported message
|
||||
# digests used for the signature are not treated as fatal errors.
|
||||
# https://issues.redhat.com/browse/RHEL-25254
|
||||
Patch5: runtime-openssl-sha1.patch
|
||||
|
||||
# https://github.com/dotnet/source-build/issues/3571
|
||||
Patch3: fix-mono-typeloadexception.patch
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
ExclusiveArch: aarch64 ppc64le s390x x86_64
|
||||
%else
|
||||
ExclusiveArch: x86_64
|
||||
%endif
|
||||
|
||||
|
||||
BuildRequires: clang
|
||||
|
|
@ -111,7 +112,6 @@ BuildRequires: git
|
|||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: glibc-langpack-en
|
||||
%endif
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: hostname
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libicu-devel
|
||||
|
|
@ -265,18 +265,6 @@ It particularly focuses on creating console applications, web
|
|||
applications and micro-services.
|
||||
|
||||
|
||||
%package -n dotnet-runtime-dbg-%{dotnetver}
|
||||
|
||||
Version: %{runtime_rpm_version}
|
||||
Summary: Managed debug symbols NET %{dotnetver} runtime
|
||||
|
||||
Requires: dotnet-runtime-%{dotnetver}%{?_isa} = %{runtime_rpm_version}-%{release}
|
||||
|
||||
%description -n dotnet-runtime-dbg-%{dotnetver}
|
||||
This package contains the managed symbol (pdb) files useful to debug the
|
||||
managed parts of the .NET runtime itself.
|
||||
|
||||
|
||||
%package -n aspnetcore-runtime-%{dotnetver}
|
||||
|
||||
Version: %{aspnetcore_runtime_rpm_version}
|
||||
|
|
@ -296,18 +284,6 @@ It particularly focuses on creating console applications, web
|
|||
applications and micro-services.
|
||||
|
||||
|
||||
%package -n aspnetcore-runtime-dbg-%{dotnetver}
|
||||
|
||||
Version: %{aspnetcore_runtime_rpm_version}
|
||||
Summary: Managed debug symbols for the ASP.NET Core %{dotnetver} runtime
|
||||
|
||||
Requires: aspnetcore-runtime-%{dotnetver}%{?_isa} = %{aspnetcore_runtime_rpm_version}-%{release}
|
||||
|
||||
%description -n aspnetcore-runtime-dbg-%{dotnetver}
|
||||
This package contains the managed symbol (pdb) files useful to debug the
|
||||
managed parts of the ASP.NET Core runtime itself.
|
||||
|
||||
|
||||
%package -n dotnet-templates-%{dotnetver}
|
||||
|
||||
Version: %{sdk_rpm_version}
|
||||
|
|
@ -355,18 +331,6 @@ It particularly focuses on creating console applications, web
|
|||
applications and micro-services.
|
||||
|
||||
|
||||
%package -n dotnet-sdk-dbg-%{dotnetver}
|
||||
|
||||
Version: %{sdk_rpm_version}
|
||||
Summary: Managed debug symbols for the .NET %{dotnetver} Software Development Kit
|
||||
|
||||
Requires: dotnet-sdk-%{dotnetver}%{?_isa} = %{sdk_rpm_version}-%{release}
|
||||
|
||||
%description -n dotnet-sdk-dbg-%{dotnetver}
|
||||
This package contains the managed symbol (pdb) files useful to debug the .NET
|
||||
Software Development Kit (SDK) itself.
|
||||
|
||||
|
||||
%global dotnet_targeting_pack() %{expand:
|
||||
%package -n %{1}
|
||||
|
||||
|
|
@ -404,8 +368,6 @@ These are not meant for general use.
|
|||
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
|
||||
release_json_tag=$(grep tag %{SOURCE5} | cut -d: -f2 | sed -E 's/[," ]*//g')
|
||||
if [[ ${release_json_tag} != %{upstream_tag} ]]; then
|
||||
echo "error: tag in release.json doesn't match tag in spec file"
|
||||
|
|
@ -413,7 +375,7 @@ if [[ ${release_json_tag} != %{upstream_tag} ]]; then
|
|||
fi
|
||||
|
||||
%if %{without bootstrap}
|
||||
%setup -q -n dotnet-%{upstream_tag_without_v}
|
||||
%setup -q -n dotnet-%{upstream_tag}
|
||||
|
||||
# Remove all prebuilts
|
||||
find -iname '*.dll' -type f -delete
|
||||
|
|
@ -533,6 +495,12 @@ export EXTRA_LDFLAGS="$LDFLAGS"
|
|||
# suggested compile-time change doesn't work, unfortunately.
|
||||
export COMPlus_LTTng=0
|
||||
|
||||
# OpenSSL 3.0 in RHEL 9 and newer versions of Fedora has disabled
|
||||
# SHA1, used by .NET for strong name signing. See
|
||||
# https://github.com/dotnet/runtime/issues/67304
|
||||
# https://gitlab.com/redhat/centos-stream/rpms/openssl/-/commit/78fb78d30755ae18fdaef28ef392f4e67c662ff6
|
||||
export OPENSSL_ENABLE_SHA1_SIGNATURES=1
|
||||
|
||||
VERBOSE=1 ./build.sh \
|
||||
%if %{without bootstrap}
|
||||
--with-sdk previously-built-dotnet \
|
||||
|
|
@ -554,14 +522,14 @@ sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE21} > dotnet.sh
|
|||
%install
|
||||
install -dm 0755 %{buildroot}%{_libdir}/dotnet
|
||||
ls artifacts/%{runtime_arch}/Release
|
||||
mkdir -p built-sdk
|
||||
tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C built-sdk/
|
||||
tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
|
||||
|
||||
# Convert hardlinks to actual copies. This takes up quite a bit of
|
||||
# extra disk space, but works around RHEL issues in post-rpmbuild tools
|
||||
# when they encounter hardlinks.
|
||||
cp -r --preserve=mode,ownership,timestamps built-sdk/* %{buildroot}%{_libdir}/dotnet/
|
||||
ls %{buildroot}%{_libdir}/dotnet
|
||||
# See https://github.com/dotnet/source-build/issues/2579
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'testhost.x86' -delete
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete
|
||||
|
||||
# https://github.com/dotnet/source-build/issues/3452
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'containerize' -delete
|
||||
|
||||
# Delete bundled certificates: we want to use the system store only,
|
||||
# except for when we have no other choice and ca-certificates doesn't
|
||||
|
|
@ -575,12 +543,12 @@ if [[ $(find %{buildroot}%{_libdir}/dotnet -name '*.pem' -print | wc -l) != 1 ]]
|
|||
fi
|
||||
|
||||
# Install managed symbols
|
||||
tar xf artifacts/%{runtime_arch}/Release/dotnet-symbols-sdk-%{sdk_version}*-%{runtime_id}.tar.gz \
|
||||
-C %{buildroot}%{_libdir}/dotnet/
|
||||
find %{buildroot}%{_libdir}/dotnet/packs -iname '*.pdb' -delete
|
||||
tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_id}-%{runtime_version}.tar.gz \
|
||||
-C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/
|
||||
|
||||
# Fix executable permissions on files
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'apphost' -exec chmod +x {} \;
|
||||
#find %{buildroot}%{_libdir}/dotnet/ -type f -name 'containerize' -exec chmod +x {} \;
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'singlefilehost' -exec chmod +x {} \;
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'lib*so' -exec chmod +x {} \;
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.a' -exec chmod -x {} \;
|
||||
|
|
@ -633,14 +601,6 @@ echo "Testing build results for debug symbols..."
|
|||
%{SOURCE20} -v %{buildroot}%{_libdir}/dotnet/
|
||||
|
||||
|
||||
find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.NETCore.App -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-runtime-non-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.NETCore.App -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-runtime-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' > aspnetcore-runtime-non-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > aspnetcore-runtime-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/sdk -type d | tail -n +2 | sed -E 's|%{buildroot}||' | sed -E 's|^|%dir |' > dotnet-sdk-non-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/sdk -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' >> dotnet-sdk-non-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-sdk-dbg-files
|
||||
|
||||
|
||||
%check
|
||||
%if 0%{?fedora} > 35
|
||||
|
|
@ -677,26 +637,23 @@ export COMPlus_LTTng=0
|
|||
%dir %{_libdir}/dotnet/host/fxr
|
||||
%{_libdir}/dotnet/host/fxr/%{host_version}
|
||||
|
||||
%files -n dotnet-runtime-%{dotnetver} -f dotnet-runtime-non-dbg-files
|
||||
%files -n dotnet-runtime-%{dotnetver}
|
||||
%dir %{_libdir}/dotnet/shared
|
||||
%dir %{_libdir}/dotnet/shared/Microsoft.NETCore.App
|
||||
%dir %{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}
|
||||
%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}
|
||||
|
||||
%files -n dotnet-runtime-dbg-%{dotnetver} -f dotnet-runtime-dbg-files
|
||||
|
||||
%files -n aspnetcore-runtime-%{dotnetver} -f aspnetcore-runtime-non-dbg-files
|
||||
%files -n aspnetcore-runtime-%{dotnetver}
|
||||
%dir %{_libdir}/dotnet/shared
|
||||
%dir %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App
|
||||
%dir %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App/%{aspnetcore_runtime_version}
|
||||
|
||||
%files -n aspnetcore-runtime-dbg-%{dotnetver} -f aspnetcore-runtime-dbg-files
|
||||
%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App/%{aspnetcore_runtime_version}
|
||||
|
||||
%files -n dotnet-templates-%{dotnetver}
|
||||
%dir %{_libdir}/dotnet/templates
|
||||
%{_libdir}/dotnet/templates/%{templates_version}
|
||||
|
||||
%files -n dotnet-sdk-%{dotnetver} -f dotnet-sdk-non-dbg-files
|
||||
%files -n dotnet-sdk-%{dotnetver}
|
||||
%dir %{_libdir}/dotnet/sdk
|
||||
%{_libdir}/dotnet/sdk/%{sdk_version}
|
||||
%dir %{_libdir}/dotnet/sdk-manifests
|
||||
%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}*
|
||||
%{_libdir}/dotnet/metadata
|
||||
|
|
@ -704,74 +661,12 @@ export COMPlus_LTTng=0
|
|||
%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Runtime.%{runtime_id}/%{aspnetcore_runtime_version}
|
||||
%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Runtime.%{runtime_id}/%{runtime_version}
|
||||
|
||||
%files -n dotnet-sdk-dbg-%{dotnetver} -f dotnet-sdk-dbg-files
|
||||
|
||||
%files -n dotnet-sdk-%{dotnetver}-source-built-artifacts
|
||||
%dir %{_libdir}/dotnet
|
||||
%{_libdir}/dotnet/source-built-artifacts
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed May 15 2024 Omair Majid <omajid@redhat.com> - 8.0.105-2
|
||||
- Update to .NET SDK 8.0.105 and Runtime 8.0.5
|
||||
- Resolves: RHEL-35315
|
||||
|
||||
* Tue Apr 09 2024 Omair Majid <omajid@redhat.com> - 8.0.104-2
|
||||
- Update to .NET SDK 8.0.104 and Runtime 8.0.4
|
||||
- Resolves: RHEL-31208
|
||||
|
||||
* Sun Mar 31 2024 Tom Deseyn <tom.deseyn@gmail.com> - 8.0.103-3
|
||||
- We disable checking the signature of the last certificate in a chain if the certificate is supposedly self-signed.
|
||||
A side effect of not checking the self-signature of such a certificate is that disabled or unsupported message
|
||||
digests used for the signature are not treated as fatal errors.
|
||||
- Resolves: RHEL-28344
|
||||
|
||||
* Tue Mar 19 2024 Omair Majid <omajid@redhat.com> - 8.0.103-2
|
||||
- Update to .NET SDK 8.0.103 and Runtime 8.0.3
|
||||
- Resolves: RHEL-27553
|
||||
|
||||
* Tue Feb 20 2024 Tom Deseyn <tom.deseyn@gmail.com> - 8.0.102-3
|
||||
- Backport MSBuild locale fix
|
||||
- Resolves: RHEL-23936
|
||||
|
||||
* Wed Feb 14 2024 Omair Majid <omajid@redhat.com> - 8.0.102-2
|
||||
- Update to .NET SDK 8.0.102 and Runtime 8.0.2
|
||||
- Resolves: RHEL-23804
|
||||
|
||||
* Mon Jan 29 2024 Omair Majid <omajid@redhat.com> - 8.0.101-3
|
||||
- Add -dbg subpackages for symbol files
|
||||
- Resolves: RHEL-23070
|
||||
|
||||
* Mon Jan 15 2024 Omair Majid <omajid@redhat.com> - 8.0.101-2
|
||||
- Update to .NET SDK 8.0.101 and Runtime 8.0.1
|
||||
- Resolves: RHEL-19803
|
||||
|
||||
* Wed Nov 15 2023 Omair Majid <omajid@redhat.com> - 8.0.100-3
|
||||
- Update to .NET SDK 8.0.100 and Runtime 8.0.0
|
||||
- Resolves: RHEL-15352
|
||||
|
||||
* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.2-0.1
|
||||
- Update to .NET 8 RC 2
|
||||
- Resolves: RHEL-13790
|
||||
|
||||
* Thu Sep 28 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.4
|
||||
- Disable bootstrap
|
||||
- Related: RHEL-4074
|
||||
|
||||
* Wed Sep 27 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.3
|
||||
- Add backported patches for additional s390x issues
|
||||
- Related: RHEL-4074
|
||||
|
||||
* Mon Sep 18 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.2
|
||||
- Add patches to fix mono and arm64 issues
|
||||
- Include libmono-*.a files in the SDK
|
||||
- Fix CI configuration
|
||||
- Related: RHEL-4074
|
||||
|
||||
* Fri Sep 15 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.1
|
||||
- Update to .NET SDK 8.0.100 RC 1 and Runtime 8.0.0 RC 1
|
||||
- Resolves: RHEL-4074
|
||||
|
||||
* Tue Aug 22 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.7-0.2
|
||||
- Add patch to work around TypeLoadException in Mono
|
||||
- Related: RHBZ#2224124
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Usage:
|
||||
# ./build-arm64-bootstrap-tarball <bootstrap-dir> [SDK-version]
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
set -x
|
||||
|
||||
function parse-nuget-name-version-from-file() {
|
||||
package=$1
|
||||
filename=${package##*/}
|
||||
|
||||
version_suffix=$(echo "$filename" | grep -Eo '\.[[:digit:]]+.*\.nupkg')
|
||||
version=$(echo "$version_suffix" | sed -Ee 's/^\.//' -e 's/\.nupkg$//')
|
||||
name=${filename:0:(${#filename}-${#version_suffix})}
|
||||
|
||||
echo "$name" "$version"
|
||||
}
|
||||
|
||||
bootstrap_dir=$(readlink -f "$1")
|
||||
|
||||
sdk_version=${2:-$(jq -r '.tools.dotnet' "$bootstrap_dir"/global.json)}
|
||||
|
||||
mkdir -p "dotnet-prebuilts-${sdk_version}-arm64"
|
||||
|
||||
pushd "dotnet-prebuilts-${sdk_version}-arm64"
|
||||
|
||||
# Binaries can be at one of several different URLs:
|
||||
# GA releases:
|
||||
if ! wget "https://dotnetcli.azureedge.net/dotnet/Sdk/${sdk_version}/dotnet-sdk-${sdk_version}-linux-arm64.tar.gz" ; then
|
||||
# Preview releases:
|
||||
wget "https://dotnetbuilds.azureedge.net/public/Sdk/${sdk_version}/dotnet-sdk-${sdk_version}-linux-arm64.tar.gz"
|
||||
fi
|
||||
|
||||
for archive in "$bootstrap_dir"/prereqs/packages/archive/*.tar.gz; do
|
||||
mapfile -t linux_x64_packages < <(tar tf "$archive" | grep linux-x64)
|
||||
|
||||
for package in "${linux_x64_packages[@]}"; do
|
||||
if [[ "$package" = *'.Intermediate.'* ]]; then
|
||||
continue;
|
||||
fi
|
||||
|
||||
read -r name version < <(parse-nuget-name-version-from-file "$package")
|
||||
|
||||
arm_name=${name/linux-x64/linux-arm64}
|
||||
|
||||
# https://gist.github.com/omajid/c04b6025de49d0b7b18ab4a7e789484e
|
||||
nappo download --verbose "$arm_name" "$version"
|
||||
|
||||
done
|
||||
done
|
||||
|
||||
popd
|
||||
|
||||
tar czf "dotnet-prebuilts-${sdk_version}-arm64.tar.gz" "dotnet-prebuilts-${sdk_version}-arm64"
|
||||
|
|
@ -1,186 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Usage:
|
||||
# build-dotnet-tarball [--bootstrap] <tag-from-dotnet>
|
||||
#
|
||||
# Creates a source archive from a tag (or commit) at
|
||||
# https://github.com/dotnet/dotnet
|
||||
#
|
||||
# Clone dotnet/dotnet, check out the tag, and build a source-tarball.
|
||||
# Can also use a full git commit identifier instead of tag (not an
|
||||
# abbreviated 8 character commit identifier though).
|
||||
|
||||
set -euo pipefail
|
||||
IFS=$'\n\t'
|
||||
|
||||
function print_usage {
|
||||
echo "Usage:"
|
||||
echo "$0 [--bootstrap] <tag-from-dotnet>"
|
||||
echo
|
||||
echo "Creates a source archive from a tag at https://github.com/dotnet/dotnet"
|
||||
echo ""
|
||||
echo " --bootstrap build a source tarball usable for bootstrapping .NET"
|
||||
}
|
||||
|
||||
function clean_dotnet_cache {
|
||||
rm -rf ~/.aspnet ~/.dotnet/ ~/.nuget/ ~/.local/share/NuGet ~/.templateengine
|
||||
rm -rf /tmp/NuGet /tmp/NuGetScratch /tmp/.NETCore* /tmp/.NETStandard* /tmp/.dotnet /tmp/dotnet.* /tmp/clr-debug-pipe* /tmp/Razor-Server /tmp/CoreFxPipe* /tmp/VBCSCompiler /tmp/.NETFramework*
|
||||
rm -rf ~/.npm/
|
||||
}
|
||||
|
||||
function check_bootstrap_environment {
|
||||
if rpm -qa | grep dotnet ; then
|
||||
echo "error: dotnet is installed. Not a good idea for bootstrapping."
|
||||
exit 1
|
||||
fi
|
||||
if [ -d /usr/lib/dotnet ] || [ -d /usr/lib64/dotnet ] || [ -d /usr/share/dotnet ] ; then
|
||||
echo "error: one of /usr/lib/dotnet /usr/lib64/dotnet or /usr/share/dotnet/ exists. Not a good idea for bootstrapping."
|
||||
exit 1
|
||||
fi
|
||||
if command -v dotnet ; then
|
||||
echo "error: dotnet is in $PATH. Not a good idea for bootstrapping."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
function runtime_id {
|
||||
|
||||
source /etc/os-release
|
||||
case "${ID}" in
|
||||
# Remove the RHEL minor version
|
||||
rhel) rid_version=${VERSION_ID%.*} ;;
|
||||
|
||||
*) rid_version=${VERSION_ID} ;;
|
||||
esac
|
||||
|
||||
echo "${ID}.${rid_version}-${arch}"
|
||||
}
|
||||
|
||||
build_bootstrap=false
|
||||
|
||||
declare -A archmap
|
||||
archmap=(
|
||||
["aarch64"]="arm64"
|
||||
["amd64"]="x64"
|
||||
["armv8l"]="arm"
|
||||
["i386"]="x86"
|
||||
["i686"]="x86"
|
||||
["ppc64le"]="ppc64le"
|
||||
["s390x"]="s390x"
|
||||
["x86_64"]="x64"
|
||||
)
|
||||
|
||||
arch=${archmap["$(uname -m)"]}
|
||||
|
||||
|
||||
positional_args=()
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
arg="${1}"
|
||||
case "${arg}" in
|
||||
--bootstrap)
|
||||
check_bootstrap_environment
|
||||
build_bootstrap=true
|
||||
shift
|
||||
;;
|
||||
-h|--help)
|
||||
print_usage
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
positional_args+=("$1")
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
|
||||
tag=${positional_args[0]:-}
|
||||
if [[ -z ${tag} ]]; then
|
||||
echo "error: missing tag to build"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
set -x
|
||||
|
||||
dir_name="dotnet-${tag}"
|
||||
unmodified_tarball_name="${dir_name}-original"
|
||||
tarball_name="${dir_name}"
|
||||
tarball_suffix=.tar.gz
|
||||
|
||||
if [[ ${build_bootstrap} == true ]]; then
|
||||
unmodified_tarball_name="${unmodified_tarball_name}-${arch}-bootstrap"
|
||||
tarball_name="${tarball_name}-${arch}-bootstrap"
|
||||
tarball_suffix=.tar.xz
|
||||
fi
|
||||
|
||||
if [ -f "${tarball_name}${tarball_suffix}" ]; then
|
||||
echo "error: ${tarball_name}${tarball_suffix} already exists"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then
|
||||
wget https://github.com/dotnet/dotnet/archive/refs/tags/${tag}.tar.gz
|
||||
mv "${tag}.tar.gz" "${unmodified_tarball_name}.tar.gz"
|
||||
|
||||
#temp_dir=$(mktemp -d -p "$(pwd)" -t temp-build-dotnet-tarball-XXXXXXXXXX)
|
||||
#pushd "${temp_dir}"
|
||||
#mkdir dotnet
|
||||
#pushd dotnet
|
||||
#git init
|
||||
#git remote add origin https://github.com/dotnet/dotnet
|
||||
#git fetch --depth 1 origin "${tag}"
|
||||
#git checkout FETCH_HEAD
|
||||
#git submodule update --init --recursive
|
||||
#clean_dotnet_cache
|
||||
#./eng/pack-sources.sh -o "$(readlink -f ../../"${unmodified_tarball_name}.tar.gz")"
|
||||
#popd
|
||||
#popd
|
||||
|
||||
#rm -rf "${temp_dir}"
|
||||
|
||||
fi
|
||||
|
||||
tar tf "${unmodified_tarball_name}".tar.gz > .tarball_file_list
|
||||
extracted_tarball_root=$(head -1 .tarball_file_list | cut -d/ -f 1)
|
||||
if [[ "$extracted_tarball_root" == "."* ]]; then
|
||||
echo "error: can't find main directory in the dotnet tarball"
|
||||
exit 1
|
||||
fi
|
||||
if [[ $(grep -cv "^${extracted_tarball_root}/" .tarball_file_list) -gt 0 ]]; then
|
||||
echo "error: tarball doesn't have a single main directory"
|
||||
exit 1
|
||||
fi
|
||||
rm .tarball_file_list
|
||||
|
||||
rm -rf "${tarball_name}"
|
||||
rm -rf "${extracted_tarball_root}"
|
||||
tar xf "${unmodified_tarball_name}.tar.gz"
|
||||
mv "${extracted_tarball_root}" "${tarball_name}"
|
||||
|
||||
pushd "${tarball_name}"
|
||||
|
||||
if [[ ${build_bootstrap} == true ]]; then
|
||||
./prep.sh --bootstrap
|
||||
else
|
||||
find . -type f -iname '*.tar.gz' -delete
|
||||
rm -rf .dotnet
|
||||
fi
|
||||
|
||||
# Remove files with funny licenses and crypto implementations and
|
||||
# other not-very-useful artifacts. We MUST NOT ship any files that
|
||||
# have unapproved licenses and unexpected cryptographic
|
||||
# implementations.
|
||||
#
|
||||
# We use rm -r (no -f) to make sure the operation fails if the files
|
||||
# are not at the expected locations. If the files are not at the
|
||||
# expected location, we need to find the new location of the files and
|
||||
# delete them, or verify that upstream has already removed the files.
|
||||
|
||||
popd
|
||||
|
||||
# if [[ ${build_bootstrap} == true ]]; then
|
||||
# tar -I 'xz -9 -T 0' -cf "${tarball_name}${tarball_suffix}" "${tarball_name}"
|
||||
# else
|
||||
# tar -czf "${tarball_name}${tarball_suffix}" "${tarball_name}"
|
||||
# fi
|
||||
tar -czf "${tarball_name}${tarball_suffix}" "${tarball_name}"
|
||||
13
copr-build
13
copr-build
|
|
@ -1,13 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
set -x
|
||||
|
||||
fedpkg --release f37 srpm 2>&1 | tee fedpkg.output
|
||||
|
||||
srpm_name=$(grep 'Wrote: ' fedpkg.output | cut -d' ' -f 2)
|
||||
|
||||
ls -alh "${srpm_name}"
|
||||
|
||||
copr-cli --debug build @dotnet-sig/dotnet-preview "${srpm_name}" --timeout 36000
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
# Tarball is generated, no upstream URL
|
||||
addFilter("W:.*invalid-url Source0: dotnet-.*tar.gz")
|
||||
|
||||
# macOS is the correct name
|
||||
addFilter("W: spelling-error %description -l en_US macOS ->.*")
|
||||
# The name of the nuget package includes NETCore
|
||||
addFilter("W: spelling-error .* NETCore -> Net Core.*")
|
||||
|
||||
# Upstream really has no README or documentation files. They suggest using online resources.
|
||||
addFilter("W: no-documentation")
|
||||
|
||||
# This is a script that we run; it's expected to have execute permissions
|
||||
addFilter("W: strange-permission check-debug-symbols.py")
|
||||
|
||||
# libicu is a required dependency, but it's used via a dlopen()
|
||||
addFilter("E: explicit-lib-dependency libicu")
|
||||
|
||||
# There's no devel package for us to place .h files
|
||||
addFilter("W: devel-file-in-non-devel-package /usr/lib64/dotnet/.*\.h")
|
||||
addFilter("W: devel-file-in-non-devel-package /usr/lib64/dotnet/.*\.a")
|
||||
|
||||
# These paths are non-standard, so we need $ORIGIN to find these libraries
|
||||
addFilter("E: binary-or-shlib-defines-rpath /usr/lib64/dotnet/.*\['\$ORIGIN/netcoredeps'\]")
|
||||
addFilter("E: binary-or-shlib-defines-rpath /usr/lib64/dotnet/.*\['\$ORIGIN'\]")
|
||||
|
||||
# We put dll files in /usr/lib/dotnet, but rpmlint somehow doesn't see it as a binary?
|
||||
addFilter("W: only-non-binary-in-usr-lib")
|
||||
|
||||
# We use a number of zero-length files, including _._
|
||||
addFilter("E: zero-length /usr/lib64/dotnet/.*/_\._")
|
||||
|
||||
# Upstream uses hidden files, even though we ask them not to, as much as possible
|
||||
addFilter("W: hidden-file-or-dir /usr/lib64/dotnet/.*/\.version")
|
||||
addFilter("W: hidden-file-or-dir /usr/lib64/dotnet/.*/\.toolsetversion")
|
||||
|
||||
23
gating.yaml
23
gating.yaml
|
|
@ -1,23 +0,0 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_testing
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-*
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.other-archs.functional}
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
From 68fa6537305beda5cb059c898349f37bda285ca7 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Deseyn <tom.deseyn@gmail.com>
|
||||
Date: Thu, 1 Feb 2024 09:23:16 +0100
|
||||
Subject: [PATCH 1/1] Exec: stop setting a locale on Unix.
|
||||
|
||||
This backports a fix that is part of Microsoft's upcoming
|
||||
8.0.2xx SDK to the 8.0.1xx SDK that we package.
|
||||
|
||||
This fix stops MSBuild Exec from printing warnings and/or
|
||||
failing in bash envionments where the glibc en_US locale
|
||||
is not available (which is common in container images).
|
||||
|
||||
The backport includes the changewave opt-out that allows
|
||||
users to revert back to the previous behavior by setting
|
||||
the MSBUILDDISABLEFEATURESFROMVERSION envvar to the
|
||||
version where the feature is introduced ("17.10").
|
||||
---
|
||||
src/msbuild/src/Framework/ChangeWaves.cs | 3 +-
|
||||
src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs | 36 +++++++++++++++++++
|
||||
src/msbuild/src/Tasks/Exec.cs | 7 +++-
|
||||
3 files changed, 44 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/msbuild/src/Framework/ChangeWaves.cs b/src/msbuild/src/Framework/ChangeWaves.cs
|
||||
index 0050723798..1f925324ac 100644
|
||||
--- a/src/msbuild/src/Framework/ChangeWaves.cs
|
||||
+++ b/src/msbuild/src/Framework/ChangeWaves.cs
|
||||
@@ -27,7 +27,8 @@ namespace Microsoft.Build.Framework
|
||||
internal static readonly Version Wave17_4 = new Version(17, 4);
|
||||
internal static readonly Version Wave17_6 = new Version(17, 6);
|
||||
internal static readonly Version Wave17_8 = new Version(17, 8);
|
||||
- internal static readonly Version[] AllWaves = { Wave17_4, Wave17_6, Wave17_8 };
|
||||
+ internal static readonly Version Wave17_10 = new Version(17, 10);
|
||||
+ internal static readonly Version[] AllWaves = { Wave17_4, Wave17_6, Wave17_8, Wave17_10 };
|
||||
|
||||
/// <summary>
|
||||
/// Special value indicating that all features behind all Change Waves should be enabled.
|
||||
diff --git a/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs b/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs
|
||||
index cb468a6cce..c0598e4978 100644
|
||||
--- a/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs
|
||||
+++ b/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs
|
||||
@@ -69,6 +69,42 @@ namespace Microsoft.Build.UnitTests
|
||||
}
|
||||
}
|
||||
|
||||
+ [UnixOnlyTheory]
|
||||
+ [InlineData(true)]
|
||||
+ [InlineData(false)]
|
||||
+ public void ExecSetsLocaleOnUnix(bool enableChangeWave)
|
||||
+ {
|
||||
+ using (var env = TestEnvironment.Create())
|
||||
+ {
|
||||
+ env.SetEnvironmentVariable("LANG", null);
|
||||
+ env.SetEnvironmentVariable("LC_ALL", null);
|
||||
+
|
||||
+ if (enableChangeWave)
|
||||
+ {
|
||||
+ ChangeWaves.ResetStateForTests();
|
||||
+ // Important: use the version here
|
||||
+ env.SetEnvironmentVariable("MSBUILDDISABLEFEATURESFROMVERSION", ChangeWaves.Wave17_10.ToString());
|
||||
+ BuildEnvironmentHelper.ResetInstance_ForUnitTestsOnly();
|
||||
+ }
|
||||
+
|
||||
+ Exec exec = PrepareExec("echo LANG=$LANG; echo LC_ALL=$LC_ALL;");
|
||||
+ bool result = exec.Execute();
|
||||
+ Assert.True(result);
|
||||
+
|
||||
+ MockEngine engine = (MockEngine)exec.BuildEngine;
|
||||
+ if (enableChangeWave)
|
||||
+ {
|
||||
+ engine.AssertLogContains("LANG=en_US.UTF-8");
|
||||
+ engine.AssertLogContains("LC_ALL=en_US.UTF-8");
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ engine.AssertLogDoesntContain("LANG=en_US.UTF-8");
|
||||
+ engine.AssertLogDoesntContain("LC_ALL=en_US.UTF-8");
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/// <summary>
|
||||
/// Ensures that calling the Exec task does not leave any extra TEMP files
|
||||
/// lying around.
|
||||
diff --git a/src/msbuild/src/Tasks/Exec.cs b/src/msbuild/src/Tasks/Exec.cs
|
||||
index dbf4be1fc5..9faaa68887 100644
|
||||
--- a/src/msbuild/src/Tasks/Exec.cs
|
||||
+++ b/src/msbuild/src/Tasks/Exec.cs
|
||||
@@ -591,7 +591,12 @@ namespace Microsoft.Build.Tasks
|
||||
{
|
||||
commandLine.AppendSwitch("-c");
|
||||
commandLine.AppendTextUnquoted(" \"");
|
||||
- commandLine.AppendTextUnquoted("export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; . ");
|
||||
+ bool setLocale = !ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10);
|
||||
+ if (setLocale)
|
||||
+ {
|
||||
+ commandLine.AppendTextUnquoted("export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; ");
|
||||
+ }
|
||||
+ commandLine.AppendTextUnquoted(". ");
|
||||
commandLine.AppendFileNameIfNotNull(batchFileForCommandLine);
|
||||
commandLine.AppendTextUnquoted("\"");
|
||||
}
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: BSN Pgp v1.1.0.0
|
||||
|
||||
mQINBGUKsUYBEADVCJm4EhXALr1ld42kWeh/vM0XMZ2orNT6NRLDRYjpE4mm4UqA
|
||||
vpjfGCwt5fLcrT4yZng8ABkB3QwTsZzmxesAMD5AZR/gdU1G96DuDGsjp6zJvTuX
|
||||
zvz3PXUYfcl9n5X32acA6N9J5Xfp10xqX3oitUODBdYy/vKW/v/y87ZxgaR6a3wp
|
||||
pPJBJIVKwFJx13v4BHRsGp1fepliQcXPvmNKFNI20le5+FbLq6C9hY5wcwGHGfQr
|
||||
EokH79GsmqgSImqxDOIh06J5VfWA+JwV+3vf95pD8IUrRfGQ+GK7b1/bySxtM5Qa
|
||||
b/IDgvl/Qq3AzEpGarMBaqGbqMz1C7jd8Y6nyKMP/V+OCjbEdYNM8GRz6kBP3Un+
|
||||
Frat5Lc2o4DF+zB3PKIJS3hku5gwlJu6IU1F23vmYFtjUcpRGmyQZDoWyBbOWlB5
|
||||
4SXqVu16amUsRFYmOK8BJMjdotcVbriVIv6WRmugfhIMoRJzVGxYkdbuiuMAX69V
|
||||
xDoGpxX5A8S5A79y0USUVtadQfFavMTyb/gUuUe8oDsqK9gdI3ETxLYG4gYwauVX
|
||||
fCGfoLOKsq5dPzEuEA7GCRrMau+rHKFaM7BigSdnHFW7xNZ4v0YnXAagoqM2G5o5
|
||||
9sak0l57vxxTVk2V3iZzkoU2J2Zlyxyh72n5vjRmb7aNwmQh4Eav6a8ssQARAQAB
|
||||
tBlvbm54Y29yZWRldkBtaWNyb3NvZnQuY29tiQI4BBMBCAAiBQJlCrFGAhsDBgsJ
|
||||
CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRD9v1PCTbSHLtfzEADIKq15XDeQxLSo
|
||||
BG1aFa9n82K1YADVcu1LeddfhDmQWLnZNgyHtQlKN2n59282CXtgymzae3uc05s2
|
||||
feIJaqF4M4NnCX8Ct3K7Hq1jI7ZktlquPCCy9XHq9aQY8XTxmdtRevtclKgYTwDh
|
||||
w+D/KbE8vTZ6o7JoubA3MKf4k3S8qL/0rIyaC6h0EpiWoMy1TdNMMK7BT4kl6Vz4
|
||||
W6KmNgOux1Pzku5ULM4WuOzmwW+NAzpOLJowfDs1ZC2RM3+g9i1/DmwWtCHngvGD
|
||||
+clA0I0agXxo05toOBTfwxd2gWYczuo/Ole16fYTzqT6n0DHqOjjcc9A7EmC72fQ
|
||||
J+hHAqM+4+CbEGuMpNnTMpCZs98bcK3Rqx/bDJYtbclZzm5O/V4nVbDrJZKzpgA1
|
||||
KuzNMLkr62P6/t15UsStgmrlTILmE5NG0CR1mj/46+mNbsMZCel3dcvnT1Zf4rTq
|
||||
QxMC7Dd/DECKQVC339G/BRfNyhOk2S1mZR/g1uS4bznL+tiwudDh/TAi5C3ZBDMh
|
||||
0muwD9caXS/QFIBWtb2ai3IcpU357R/ERPKLcWYtoYJ80RuKi6XYr1WxSPBmd5Qm
|
||||
wuncye+wR2dveo2jnIXZGUSgz50ZNgBxs/cYWAQ8J6KMgIBa+JY2qalzvIGbrC5x
|
||||
Sr+CkhS8vrktfnRgc8yBssJnvNfqXA==
|
||||
=pKgS
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
10
release.json
10
release.json
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"release": "8.0.5",
|
||||
"channel": "8.0",
|
||||
"tag": "v8.0.5",
|
||||
"sdkVersion": "8.0.105",
|
||||
"runtimeVersion": "8.0.5",
|
||||
"aspNetCoreVersion": "8.0.5",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "181780576f29353fd077b649e7624cf806e882e7"
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
---
|
||||
inspections:
|
||||
# We patch upstream a lot, no need to reject patches
|
||||
patches: off
|
||||
badfuncs:
|
||||
allowed:
|
||||
# The Mono runtime (used on s390x, for example), uses inet_addr for
|
||||
# debugging (such as sending the control flow graph to a remote process).
|
||||
# See runtime/src/mono/mono/mini/cfgdump.c. This isn't part of any
|
||||
# standard networking facility; networking APIs are implemented/used in
|
||||
# libSystem*so.
|
||||
/usr/lib64/dotnet/shared/Microsoft.NETCore.App/*/libcoreclr.so:
|
||||
- inet_addr
|
||||
/usr/lib64/dotnet/packs/Microsoft.NETCore.App.Runtime.*/*/runtimes/*/native/libcoreclr.so:
|
||||
- inet_addr
|
||||
runpath:
|
||||
# Upstream explicitly sets $ORIGIN/netcoredeps as an RPATH
|
||||
# See https://github.com/dotnet/core/blob/main/Documentation/self-contained-linux-apps.md
|
||||
allowed_origin_paths:
|
||||
- /netcoredeps
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
From d7805229ffe6906cd0832c0482b963caf4b4fd82 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Deseyn <tom.deseyn@gmail.com>
|
||||
Date: Wed, 28 Feb 2024 14:08:15 +0100
|
||||
Subject: [PATCH] Allow certificate validation with SHA-1 signatures.
|
||||
|
||||
RHEL OpenSSL builds disable SHA-1 signatures. This causes certificate
|
||||
validation to fail when using the X509_V_FLAG_CHECK_SS_SIGNATURE flag
|
||||
with a chain where the last certificate uses a SHA-1 signature.
|
||||
|
||||
This removes X509_V_FLAG_CHECK_SS_SIGNATURE flag to have the default
|
||||
OpenSSL behavior for certificate validation.
|
||||
---
|
||||
.../libs/System.Security.Cryptography.Native/pal_x509.c | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_x509.c b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_x509.c
|
||||
index 04c6ba06cd..2cd3413dae 100644
|
||||
--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_x509.c
|
||||
+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_x509.c
|
||||
@@ -272,11 +272,6 @@ int32_t CryptoNative_X509StoreCtxInit(X509_STORE_CTX* ctx, X509_STORE* store, X5
|
||||
|
||||
int32_t val = X509_STORE_CTX_init(ctx, store, x509, extraStore);
|
||||
|
||||
- if (val != 0)
|
||||
- {
|
||||
- X509_STORE_CTX_set_flags(ctx, X509_V_FLAG_CHECK_SS_SIGNATURE);
|
||||
- }
|
||||
-
|
||||
return val;
|
||||
}
|
||||
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
|
@ -1,142 +0,0 @@
|
|||
From 5fdc289903bd3a77d455583650b00297da0cae8f Mon Sep 17 00:00:00 2001
|
||||
From: Omair Majid <omajid@redhat.com>
|
||||
Date: Fri, 2 Feb 2024 15:51:23 -0500
|
||||
Subject: [PATCH] Revert "Disable implicit rejection for RSA PKCS#1 (#95216)"
|
||||
|
||||
This reverts commit a5fc8ff9b03ffb2fdb81dad524ad1a20a0714995.
|
||||
|
||||
To quote Clemens Lang:
|
||||
|
||||
> [Disabling implcit rejection] re-enables a Bleichenbacher timing oracle
|
||||
> attack against PKCS#1v1.5 decryption. See
|
||||
> https://people.redhat.com/~hkario/marvin/ for details and
|
||||
> https://github.com/dotnet/runtime/pull/95157#issuecomment-1842784399 for a
|
||||
> comment by the researcher who published the vulnerability and proposed the
|
||||
> change in OpenSSL.
|
||||
|
||||
For more details, see:
|
||||
https://github.com/dotnet/runtime/pull/95216#issuecomment-1842799314
|
||||
---
|
||||
.../RSA/EncryptDecrypt.cs | 49 ++++---------------
|
||||
.../opensslshim.h | 6 ---
|
||||
.../pal_evp_pkey_rsa.c | 13 -----
|
||||
3 files changed, 10 insertions(+), 58 deletions(-)
|
||||
|
||||
diff --git a/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs b/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
|
||||
index 39f3ebc82ec..5b97f468a42 100644
|
||||
--- a/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
|
||||
+++ b/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
|
||||
@@ -353,10 +353,19 @@ private void RsaCryptRoundtrip(RSAEncryptionPadding paddingMode, bool expectSucc
|
||||
Assert.Equal(TestData.HelloBytes, output);
|
||||
}
|
||||
|
||||
- [ConditionalFact(nameof(PlatformSupportsEmptyRSAEncryption))]
|
||||
+ [ConditionalFact]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
|
||||
public void RoundtripEmptyArray()
|
||||
{
|
||||
+ if (OperatingSystem.IsIOS() && !OperatingSystem.IsIOSVersionAtLeast(13, 6))
|
||||
+ {
|
||||
+ throw new SkipTestException("iOS prior to 13.6 does not reliably support RSA encryption of empty data.");
|
||||
+ }
|
||||
+ if (OperatingSystem.IsTvOS() && !OperatingSystem.IsTvOSVersionAtLeast(14, 0))
|
||||
+ {
|
||||
+ throw new SkipTestException("tvOS prior to 14.0 does not reliably support RSA encryption of empty data.");
|
||||
+ }
|
||||
+
|
||||
using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params))
|
||||
{
|
||||
void RoundtripEmpty(RSAEncryptionPadding paddingMode)
|
||||
@@ -757,23 +746,5 @@ public static IEnumerable<object[]> OaepPaddingModes
|
||||
}
|
||||
}
|
||||
}
|
||||
-
|
||||
- public static bool PlatformSupportsEmptyRSAEncryption
|
||||
- {
|
||||
- get
|
||||
- {
|
||||
- if (OperatingSystem.IsIOS() && !OperatingSystem.IsIOSVersionAtLeast(13, 6))
|
||||
- {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- if (OperatingSystem.IsTvOS() && !OperatingSystem.IsTvOSVersionAtLeast(14, 0))
|
||||
- {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- return true;
|
||||
- }
|
||||
- }
|
||||
}
|
||||
}
|
||||
diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
|
||||
index 0748e305d5c..cf10d2f7949 100644
|
||||
--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
|
||||
+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
|
||||
@@ -296,10 +296,8 @@ int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md, size_t len);
|
||||
REQUIRED_FUNCTION(ERR_peek_error) \
|
||||
REQUIRED_FUNCTION(ERR_peek_error_line) \
|
||||
REQUIRED_FUNCTION(ERR_peek_last_error) \
|
||||
- REQUIRED_FUNCTION(ERR_pop_to_mark) \
|
||||
FALLBACK_FUNCTION(ERR_put_error) \
|
||||
REQUIRED_FUNCTION(ERR_reason_error_string) \
|
||||
- REQUIRED_FUNCTION(ERR_set_mark) \
|
||||
LIGHTUP_FUNCTION(ERR_set_debug) \
|
||||
LIGHTUP_FUNCTION(ERR_set_error) \
|
||||
REQUIRED_FUNCTION(EVP_aes_128_cbc) \
|
||||
@@ -355,7 +353,6 @@ int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md, size_t len);
|
||||
REQUIRED_FUNCTION(EVP_PKCS82PKEY) \
|
||||
REQUIRED_FUNCTION(EVP_PKEY2PKCS8) \
|
||||
REQUIRED_FUNCTION(EVP_PKEY_CTX_ctrl) \
|
||||
- REQUIRED_FUNCTION(EVP_PKEY_CTX_ctrl_str) \
|
||||
REQUIRED_FUNCTION(EVP_PKEY_CTX_free) \
|
||||
REQUIRED_FUNCTION(EVP_PKEY_CTX_get0_pkey) \
|
||||
REQUIRED_FUNCTION(EVP_PKEY_CTX_new) \
|
||||
@@ -797,10 +794,8 @@ FOR_ALL_OPENSSL_FUNCTIONS
|
||||
#define ERR_peek_error_line ERR_peek_error_line_ptr
|
||||
#define ERR_peek_last_error ERR_peek_last_error_ptr
|
||||
#define ERR_put_error ERR_put_error_ptr
|
||||
-#define ERR_pop_to_mark ERR_pop_to_mark_ptr
|
||||
#define ERR_reason_error_string ERR_reason_error_string_ptr
|
||||
#define ERR_set_debug ERR_set_debug_ptr
|
||||
-#define ERR_set_mark ERR_set_mark_ptr
|
||||
#define ERR_set_error ERR_set_error_ptr
|
||||
#define EVP_aes_128_cbc EVP_aes_128_cbc_ptr
|
||||
#define EVP_aes_128_cfb8 EVP_aes_128_cfb8_ptr
|
||||
@@ -855,7 +850,6 @@ FOR_ALL_OPENSSL_FUNCTIONS
|
||||
#define EVP_PKCS82PKEY EVP_PKCS82PKEY_ptr
|
||||
#define EVP_PKEY2PKCS8 EVP_PKEY2PKCS8_ptr
|
||||
#define EVP_PKEY_CTX_ctrl EVP_PKEY_CTX_ctrl_ptr
|
||||
-#define EVP_PKEY_CTX_ctrl_str EVP_PKEY_CTX_ctrl_str_ptr
|
||||
#define EVP_PKEY_CTX_free EVP_PKEY_CTX_free_ptr
|
||||
#define EVP_PKEY_CTX_get0_pkey EVP_PKEY_CTX_get0_pkey_ptr
|
||||
#define EVP_PKEY_CTX_new EVP_PKEY_CTX_new_ptr
|
||||
diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
|
||||
index 043bf9f9d1e..c9ccdf33e3a 100644
|
||||
--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
|
||||
+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
|
||||
@@ -67,19 +67,6 @@ static bool ConfigureEncryption(EVP_PKEY_CTX* ctx, RsaPaddingMode padding, const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
-
|
||||
- // OpenSSL 3.2 introduced a change where PKCS#1 RSA decryption does not fail for invalid padding.
|
||||
- // If the padding is invalid, the decryption operation returns random data.
|
||||
- // See https://github.com/openssl/openssl/pull/13817 for background.
|
||||
- // Some Linux distributions backported this change to previous versions of OpenSSL.
|
||||
- // Here we do a best-effort to set a flag to revert the behavior to failing if the padding is invalid.
|
||||
- ERR_set_mark();
|
||||
-
|
||||
- EVP_PKEY_CTX_ctrl_str(ctx, "rsa_pkcs1_implicit_rejection", "0");
|
||||
-
|
||||
- // Undo any changes to the error queue that may have occured while configuring implicit rejection if the
|
||||
- // current version does not support implicit rejection.
|
||||
- ERR_pop_to_mark();
|
||||
}
|
||||
else
|
||||
{
|
||||
--
|
||||
2.43.0
|
||||
|
||||
2
sources
2
sources
|
|
@ -1,2 +0,0 @@
|
|||
SHA512 (dotnet-8.0.5.tar.gz) = 73b2045d99c76fc44a31de992119beaaa66ab460153364adcaccda01e5040c3e2d7a865c9c1b005ba445506295a6d064581a6c258236057b87d8bab5daf9c220
|
||||
SHA512 (dotnet-8.0.5.tar.gz.sig) = a7c054fe06f7a857b128908c8df49f720163e7069e4dea1f3cd26431e74ee7283142b8bb47de0710eab6ed47fe68cfd6c9a6d0d4c985480bbeb75811fdd6245c
|
||||
41
tests/ci.fmf
41
tests/ci.fmf
|
|
@ -1,41 +0,0 @@
|
|||
summary: Basic smoke test
|
||||
provision:
|
||||
disk: 20
|
||||
memory: 5120
|
||||
prepare:
|
||||
how: install
|
||||
package:
|
||||
- aspnetcore-runtime-8.0
|
||||
- babeltrace
|
||||
- bash-completion
|
||||
- bc
|
||||
- binutils
|
||||
- dotnet-runtime-8.0
|
||||
- dotnet-sdk-8.0
|
||||
- expect
|
||||
- file
|
||||
- findutils
|
||||
- gcc-c++
|
||||
- git
|
||||
- jq
|
||||
- libstdc++-devel
|
||||
- lldb
|
||||
- lttng-ust
|
||||
- npm
|
||||
- postgresql-odbc
|
||||
- postgresql-server
|
||||
- procps-ng
|
||||
- python3
|
||||
- strace
|
||||
- util-linux
|
||||
- wget
|
||||
- which
|
||||
- zlib-devel
|
||||
execute:
|
||||
script:
|
||||
- dotnet --info
|
||||
- wget --no-verbose https://github.com/redhat-developer/dotnet-bunny/releases/latest/download/turkey.tar.gz
|
||||
- tar xf turkey.tar.gz
|
||||
- dotnet turkey/Turkey.dll --version
|
||||
- git clone "https://github.com/redhat-developer/dotnet-regular-tests.git"
|
||||
- dotnet turkey/Turkey.dll -l="$TMT_TEST_DATA" dotnet-regular-tests --timeout=1200
|
||||
143
update-release
143
update-release
|
|
@ -1,143 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Usage:
|
||||
# ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release]
|
||||
|
||||
set -euo pipefail
|
||||
IFS=$'\n\t'
|
||||
|
||||
print_usage() {
|
||||
echo " Usage:"
|
||||
echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]"
|
||||
}
|
||||
|
||||
user_provided_tarball_name=""
|
||||
|
||||
rpm_release=1
|
||||
positional_args=()
|
||||
bug_ids=()
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
arg="$1"
|
||||
case "${arg}" in
|
||||
--bug)
|
||||
bug_ids+=("$2")
|
||||
shift;
|
||||
shift;
|
||||
;;
|
||||
-h|--help)
|
||||
print_usage
|
||||
exit 0
|
||||
;;
|
||||
--release-json)
|
||||
release_json="$2"
|
||||
shift;
|
||||
shift;
|
||||
;;
|
||||
--tarball)
|
||||
user_provided_tarball_name="$2"
|
||||
shift;
|
||||
shift;
|
||||
;;
|
||||
--larger-rpm-release)
|
||||
rpm_release="2"
|
||||
shift;
|
||||
;;
|
||||
*)
|
||||
positional_args+=("$1")
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
spec_files=( ./*.spec )
|
||||
spec_file="${spec_files[0]}"
|
||||
|
||||
sdk_version=${positional_args[0]:-}
|
||||
if [[ -z ${sdk_version} ]]; then
|
||||
echo "error: missing sdk version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
runtime_version=${positional_args[1]:-}
|
||||
if [[ -z ${runtime_version} ]]; then
|
||||
echo "error: missing runtime version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
host_version="$runtime_version"
|
||||
|
||||
if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
|
||||
tag=v${sdk_version}
|
||||
else
|
||||
tag=v${runtime_version}
|
||||
fi
|
||||
|
||||
set -x
|
||||
|
||||
sed -i -E "s|^%global host_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global host_version ${host_version}|" "$spec_file"
|
||||
sed -i -E "s|^%global runtime_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global runtime_version ${runtime_version}|" "$spec_file"
|
||||
sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:]][[:digit:]]|%global sdk_version ${sdk_version}|" "$spec_file"
|
||||
|
||||
|
||||
if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
|
||||
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
|
||||
echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
|
||||
else
|
||||
if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
|
||||
echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball"
|
||||
else
|
||||
if [[ -n "${user_provided_tarball_name}" ]]; then
|
||||
cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
|
||||
cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
|
||||
cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
|
||||
cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
fi
|
||||
fi
|
||||
|
||||
./build-dotnet-tarball "${tag}"
|
||||
fi
|
||||
else
|
||||
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
|
||||
echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
|
||||
elif [[ -n ${user_provided_tarball_name} ]]; then
|
||||
tag_without_v=${tag#v}
|
||||
cp -a "${user_provided_tarball_name}" dotnet-${tag_without_v}.tar.gz
|
||||
cp -a "${user_provided_tarball_name}.sig" dotnet-${tag_without_v}.tar.gz.sig
|
||||
cp -a "${release_json}" release.json
|
||||
else
|
||||
rm -f release.json
|
||||
spectool -g "$spec_file"
|
||||
fi
|
||||
fi
|
||||
|
||||
comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"
|
||||
commit_message="$comment
|
||||
"
|
||||
for bug_id in "${bug_ids[@]}"; do
|
||||
if [[ "$bug_id" =~ ^[[:digit:]]+$ ]]; then
|
||||
comment="$comment
|
||||
- Resolves: RHBZ#$bug_id"
|
||||
commit_message="$commit_message
|
||||
Resolves: RHBZ#$bug_id"
|
||||
else
|
||||
comment="$comment
|
||||
- Resolves: $bug_id"
|
||||
commit_message="$commit_message
|
||||
Resolves: $bug_id"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "$commit_message" > git-commit-message
|
||||
|
||||
rpmdev-bumpspec --comment="$comment" "$spec_file"
|
||||
|
||||
# Reset release in 'Release' tag
|
||||
sed -i -E 's|^Release: [[:digit:]]+%|Release: '"$rpm_release"'%|' "$spec_file"
|
||||
# Reset Release in changelog comment
|
||||
# See https://stackoverflow.com/questions/18620153/find-matching-text-and-replace-next-line
|
||||
sed -i -E '/^%changelog$/!b;n;s/-[[:digit:]]+$/-'"$rpm_release"'/' "$spec_file"
|
||||
|
||||
echo "Done updating sources. Commit message in ./git-commit-message"
|
||||
Loading…
Reference in New Issue