Merge pull request #155529 from SFrijters/wine-7.0
wineStable: 6.0.2 -> 7.0 / wine{Unstable,Staging}: 7.0-rc6 -> 7.0
This commit is contained in:
commit
aec48ffcb1
|
@ -1,15 +0,0 @@
|
||||||
diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
|
|
||||||
index 7cb521eb98b..5804b88be84 100644
|
|
||||||
--- a/dlls/crypt32/unixlib.c
|
|
||||||
+++ b/dlls/crypt32/unixlib.c
|
|
||||||
@@ -654,6 +654,10 @@ static void load_root_certs(void)
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++)
|
|
||||||
import_certs_from_path( CRYPT_knownLocations[i], TRUE );
|
|
||||||
+
|
|
||||||
+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE");
|
|
||||||
+ if (nix_cert_file != NULL)
|
|
||||||
+ import_certs_from_path(nix_cert_file, TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static NTSTATUS enum_root_certs( void *args )
|
|
|
@ -1,16 +1,8 @@
|
||||||
diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
|
diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c
|
||||||
index 035f2d936bb..959716d727a 100644
|
index 7cb521eb98b..5804b88be84 100644
|
||||||
--- a/dlls/crypt32/unixlib.c
|
--- a/dlls/crypt32/unixlib.c
|
||||||
+++ b/dlls/crypt32/unixlib.c
|
+++ b/dlls/crypt32/unixlib.c
|
||||||
@@ -24,6 +24,7 @@
|
@@ -654,6 +654,10 @@ static void load_root_certs(void)
|
||||||
#include "wine/port.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
#include <dirent.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
@@ -605,6 +606,10 @@ static void load_root_certs(void)
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++)
|
for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++)
|
||||||
import_certs_from_path( CRYPT_knownLocations[i], TRUE );
|
import_certs_from_path( CRYPT_knownLocations[i], TRUE );
|
||||||
|
@ -20,4 +12,4 @@ index 035f2d936bb..959716d727a 100644
|
||||||
+ import_certs_from_path(nix_cert_file, TRUE);
|
+ import_certs_from_path(nix_cert_file, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static BOOL WINAPI enum_root_certs( void *buffer, SIZE_T size, SIZE_T *needed )
|
static NTSTATUS enum_root_certs( void *args )
|
||||||
|
|
|
@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
|
||||||
in rec {
|
in rec {
|
||||||
|
|
||||||
stable = fetchurl rec {
|
stable = fetchurl rec {
|
||||||
version = "6.0.2";
|
version = "7.0";
|
||||||
url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz";
|
url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz";
|
||||||
sha256 = "sha256-3+PFiseFwHIg4o8VtiKZ12wk0lametm//Yrvpns9u3A=";
|
sha256 = "sha256-W0PifVwIXLGPlzlORhgDENXu98HZHGiVQyo4ibLeCGs=";
|
||||||
|
|
||||||
## see http://wiki.winehq.org/Gecko
|
## see http://wiki.winehq.org/Gecko
|
||||||
gecko32 = fetchurl rec {
|
gecko32 = fetchurl rec {
|
||||||
|
@ -31,9 +31,9 @@ in rec {
|
||||||
|
|
||||||
## see http://wiki.winehq.org/Mono
|
## see http://wiki.winehq.org/Mono
|
||||||
mono = fetchurl rec {
|
mono = fetchurl rec {
|
||||||
version = "5.1.1";
|
version = "7.0.0";
|
||||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||||
sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l";
|
sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -42,30 +42,12 @@ in rec {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
unstable = fetchurl rec {
|
unstable = stable;
|
||||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
|
||||||
version = "7.0-rc5";
|
|
||||||
url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz";
|
|
||||||
sha256 = "sha256-jQjHneYAZ3H26EXje9cyoduXN7TakiLksDdzNoi3d1g=";
|
|
||||||
inherit (stable) gecko32 gecko64;
|
|
||||||
|
|
||||||
## see http://wiki.winehq.org/Mono
|
|
||||||
mono = fetchurl rec {
|
|
||||||
version = "7.0.0";
|
|
||||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
|
||||||
sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Also look for root certificates at $NIX_SSL_CERT_FILE
|
|
||||||
./cert-path-6.21.patch
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
staging = fetchFromGitHub rec {
|
staging = fetchFromGitHub rec {
|
||||||
# https://github.com/wine-staging/wine-staging/releases
|
# https://github.com/wine-staging/wine-staging/releases
|
||||||
inherit (unstable) version;
|
inherit (unstable) version;
|
||||||
sha256 = "sha256-RFwDI8eGw9BikQ8X+S1+EPHKAgNaYHuZOJzmlg12ROI=";
|
sha256 = "sha256-2gBfsutKG0ok2ISnnAUhJit7H2TLPDpuP5gvfMVE44o=";
|
||||||
owner = "wine-staging";
|
owner = "wine-staging";
|
||||||
repo = "wine-staging";
|
repo = "wine-staging";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
|
|
Loading…
Reference in a new issue