From e7370efe930a30559bfa1d271f8c509529a699ae Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Fri, 29 May 2020 16:48:54 -0500 Subject: [PATCH] Update to 5.9 --- .gitignore | 6 ++-- sources | 6 ++-- wine-5.7-thread-context.patch | 62 ----------------------------------- wine.spec | 15 ++++++--- 4 files changed, 16 insertions(+), 73 deletions(-) delete mode 100644 wine-5.7-thread-context.patch diff --git a/.gitignore b/.gitignore index b1d3f99..967baf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/wine-5.7.tar.xz -/wine-5.7.tar.xz.sign -/wine-staging-5.7.tar.gz +/wine-5.9.tar.xz +/wine-5.9.tar.xz.sign +/wine-staging-5.9.tar.gz diff --git a/sources b/sources index e64a3be..7f5d1eb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (wine-5.7.tar.xz) = 46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407 -SHA512 (wine-5.7.tar.xz.sign) = 7c4361415db5d73e9ab8a041c0c0d2718ba954b13fefab24cc774256fb8c0c153dbe0a5ab000ae140e79f3b799402e494126c1d53893a6dfb3f9ed0a787b06cc -SHA512 (wine-staging-5.7.tar.gz) = 042bcf7b90769c9d88d5cd844009301fb768568ee10ebf7aed9c3397ca35f6d6b512db2010917695f32bed9edf174d95f80a141d5af75a43871444b1830f2922 +SHA512 (wine-5.9.tar.xz) = edc6d55a275cf37430a62dc6d6d86bff6d5a434e708dbd99d245018db7f6a0abe39581a1d91eb947f204a45ac94cc5c931745169a3b63a2aecf8db277553b74b +SHA512 (wine-5.9.tar.xz.sign) = 1a048d9e4229eb6391a8a48027af8c2511b5c921c70fb1c6a398570d5656c0747746d34d7d3458a7be68220d00130676ad97ddeaaee94023a63f9afeba833357 +SHA512 (wine-staging-5.9.tar.gz) = 8fcf448be21edc0ccf8afef75013298c8f1634b51cd4d927ee5a1d039552d7c29609f65f283519b6561d09eb6eeae91fa6db70b9e78e4fd8bb5318408b39fb33 diff --git a/wine-5.7-thread-context.patch b/wine-5.7-thread-context.patch deleted file mode 100644 index 894e35b..0000000 --- a/wine-5.7-thread-context.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c3fac6e36caab168974dd04a60ae1bbb1a0fd919 Mon Sep 17 00:00:00 2001 -From: Jacek Caban -Date: Sat, 25 Apr 2020 21:13:33 +0200 -Subject: [PATCH] server: Fix setting context flags in get_thread_context. - -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49011 -Signed-off-by: Jacek Caban -Signed-off-by: Alexandre Julliard ---- - dlls/kernel32/tests/thread.c | 15 +++++++++++++++ - server/thread.c | 2 +- - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c -index b6a65a4207..e068797ff5 100644 ---- a/dlls/kernel32/tests/thread.c -+++ b/dlls/kernel32/tests/thread.c -@@ -1175,6 +1175,20 @@ static void test_SetThreadContext(void) - CloseHandle( thread ); - } - -+static void test_GetThreadContext(void) -+{ -+ CONTEXT ctx; -+ BOOL ret; -+ -+ memset(&ctx, 0xcc, sizeof(ctx)); -+ ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; -+ ret = GetThreadContext(GetCurrentThread(), &ctx); -+ ok(ret, "GetThreadContext failed: %u\n", GetLastError()); -+ ok(ctx.ContextFlags == CONTEXT_DEBUG_REGISTERS, "ContextFlags = %x\n", ctx.ContextFlags); -+ ok(!ctx.Dr0, "Dr0 = %x\n", ctx.Dr0); -+ ok(!ctx.Dr1, "Dr0 = %x\n", ctx.Dr0); -+} -+ - static void test_GetThreadSelectorEntry(void) - { - LDT_ENTRY entry; -@@ -2452,6 +2466,7 @@ - #ifdef __i386__ - test_SetThreadContext(); - test_GetThreadSelectorEntry(); -+ test_GetThreadContext(); - test_NtSetLdtEntries(); - #endif - test_QueueUserWorkItem(); -diff --git a/server/thread.c b/server/thread.c -index cfdf42c756..7c1c1108eb 100644 ---- a/server/thread.c -+++ b/server/thread.c -@@ -1848,7 +1848,7 @@ DECL_HANDLER(get_thread_context) - { - assert( reply->self ); - memset( context, 0, sizeof(context_t) ); -- context->cpu = thread_context->regs.cpu; -+ context->cpu = thread->process->cpu; - if (req->flags & system_flags) - { - get_thread_context( thread, context, req->flags & system_flags ); --- -2.20.1 - diff --git a/wine.spec b/wine.spec index 0f3c530..70e7fa7 100644 --- a/wine.spec +++ b/wine.spec @@ -7,6 +7,7 @@ #global _default_patch_fuzz 2 %ifarch %{ix86} x86_64 %global wineacm acm +%global wineax ax %global winecom com %global winecpl cpl %global winedll dll @@ -17,6 +18,7 @@ %global winetlb tlb %else %global wineacm acm.so +%global wineax ax.so %global winecom com.so %global winecpl cpl.so %global winedll dll.so @@ -41,8 +43,8 @@ %endif Name: wine -Version: 5.7 -Release: 2%{?dist} +Version: 5.9 +Release: 1%{?dist} Summary: A compatibility layer for windows applications License: LGPLv2+ @@ -72,8 +74,6 @@ Source109: wine-oleview.desktop Source150: wine.appdata.xml # wine bugs -# https://bugs.winehq.org/show_bug.cgi?id=49011 -Patch100: wine-5.7-thread-context.patch # desktop dir Source200: wine.menu @@ -692,7 +692,6 @@ patches/patchinstall.sh DESTDIR="`pwd`" --all sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in %endif # 0%{?wine_staging} -%patch100 -p1 -b.thread-context %build @@ -1651,6 +1650,7 @@ fi %{_libdir}/wine/kernel32.dll.so %{_libdir}/wine/kernelbase.%{winedll} %{_libdir}/wine/ksecdd.%{winesys} +%{_libdir}/wine/ksproxy.%{wineax} %{_libdir}/wine/ksuser.%{winedll} %{_libdir}/wine/ktmw32.%{winedll} %if 0%{?fedora} > 24 @@ -1767,6 +1767,7 @@ fi %{_libdir}/wine/normaliz.%{winedll} %{_libdir}/wine/npmshtml.%{winedll} %{_libdir}/wine/npptools.%{winedll} +%{_libdir}/wine/ntdll.so %{_libdir}/wine/ntdll.dll.so %{_libdir}/wine/ntdsapi.%{winedll} %{_libdir}/wine/ntprint.%{winedll} @@ -1832,6 +1833,7 @@ fi %{_libdir}/wine/scrobj.%{winedll} %{_libdir}/wine/scrrun.%{winedll} %{_libdir}/wine/scsiport.%{winesys} +%{_libdir}/wine/sechost.%{winedll} %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.%{winedll} %{_libdir}/wine/serialui.%{winedll} @@ -2304,6 +2306,9 @@ fi %endif %changelog +* Fri May 29 2020 Michael Cronenworth 5.9-1 +- version update + * Sat May 02 2020 Michael Cronenworth 5.7-2 - fix crash in wineserver affecting many apps and games (RHBZ#1829956)