diff --git a/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch b/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch index 3cee1a7a..df979f49 100644 --- a/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch +++ b/patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch @@ -1,25 +1,25 @@ -From 2e1a505fedd43f0f03ba36e1a8413bf04f8afa83 Mon Sep 17 00:00:00 2001 +From 05ca39b029f8f710ca53aeafc36384fd39fd6b89 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 2 Oct 2014 19:53:46 +0200 -Subject: winelib: Append '(Staging)' at the end of the version string. +Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string. --- libs/wine/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in -index 1b7fea8..780be10 100644 +index 4833eb5..3cfa4f4 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in -@@ -112,7 +112,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS) +@@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS) libwine_DEPS = $(LIBWINE_DEPENDS) version.c: dummy -- version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) -+ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) +- version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) ++ version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) dummy: .PHONY: dummy -- -2.6.2 +1.9.1 diff --git a/patches/ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch b/patches/ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch index 7f5f6b48..62cd4fb0 100644 --- a/patches/ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch +++ b/patches/ntoskrnl.exe-Fix_Relocation/0001-ntoskrnl.exe-Avoid-invalid-memory-access-when-reloca.patch @@ -1,18 +1,18 @@ -From 77f6fbe85432f4bc61b1b9b27a0992a1f6269344 Mon Sep 17 00:00:00 2001 +From 28112782ac7279d42d539671a4e181264559b93d Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 10 Nov 2014 04:05:38 +0100 -Subject: ntoskrnl.exe: Avoid invalid memory access when relocation block - addresses memory outside of the current page. +Subject: [PATCH] ntoskrnl.exe: Avoid invalid memory access when relocation + block addresses memory outside of the current page. --- dlls/ntoskrnl.exe/ntoskrnl.c | 49 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c -index 577f5b3..8649863 100644 +index ace79a8..97def67 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c -@@ -3208,6 +3208,39 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) +@@ -3349,6 +3349,39 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } @@ -52,7 +52,7 @@ index 577f5b3..8649863 100644 /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { -@@ -3231,7 +3264,7 @@ static HMODULE load_driver_module( const WCHAR *name ) +@@ -3372,27 +3405,31 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { @@ -61,9 +61,8 @@ index 577f5b3..8649863 100644 IMAGE_BASE_RELOCATION *rel, *end; if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) -@@ -3239,20 +3272,24 @@ static HMODULE load_driver_module( const WCHAR *name ) - WINE_TRACE( "%s: relocating from %p to %p\n", - wine_dbgstr_w(name), (char *)module - delta, module ); + { + TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) + while (rel < end - 1 && rel->SizeOfBlock) @@ -92,5 +91,5 @@ index 577f5b3..8649863 100644 } -- -2.7.4 +1.9.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7703f675..8e2c8941 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "e9231beb865da13941d19eca016a6ccac07cb3f4" + echo "cda846b8cbc39c07ce360a6660a1c8b2e2aca24b" } # Show version information