[pkg-wine-party] [wine] 23/24: Check for invalid WINEARCH values.

Jens Reyer jreyer-guest at moszumanska.debian.org
Wed Jan 11 23:14:46 UTC 2017


This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch stretch
in repository wine.

commit a9f0f152ca50f517a558a5147bb83f08c51cf7fe
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Wed Jan 11 14:20:34 2017 +0100

    Check for invalid WINEARCH values.
    
    Closes: #838474
---
 debian/patches/series                        |  1 +
 debian/patches/upstream/check-winearch.patch | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 253d174..0c23fb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 upstream/fontdir.patch
 upstream/kfreebsd.patch
 upstream/unicode-9.patch
+upstream/check-winearch.patch
 
 version-string.patch
 manpages-wineserver-persistence.patch
diff --git a/debian/patches/upstream/check-winearch.patch b/debian/patches/upstream/check-winearch.patch
new file mode 100644
index 0000000..f702a52
--- /dev/null
+++ b/debian/patches/upstream/check-winearch.patch
@@ -0,0 +1,25 @@
+Description: Check for invalid WINEARCH values.
+Origin: upstream, http://source.winehq.org/git/wine.git/commit/df3b7958a731378d2a156d363bd9af36b34a9ac1
+Bug: https://bugs.winehq.org/show_bug.cgi?id=41378
+Bug-Debian: https://bugs.debian.org/838474
+Applied-Upstream: 2.0-rc2
+
+--- a/dlls/ntdll/server.c
++++ b/dlls/ntdll/server.c
+@@ -1368,7 +1368,15 @@ void server_init_process(void)
+             fatal_perror( "Bad server socket %d", fd_socket );
+         unsetenv( "WINESERVERSOCKET" );
+     }
+-    else fd_socket = server_connect();
++    else
++    {
++        const char *arch = getenv( "WINEARCH" );
++
++        if (arch && strcmp( arch, "win32" ) && strcmp( arch, "win64" ))
++            fatal_error( "WINEARCH set to invalid value '%s', it must be either win32 or win64.\n", arch );
++
++        fd_socket = server_connect();
++    }
+ 
+     /* setup the signal mask */
+     sigemptyset( &server_block_set );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git



More information about the pkg-wine-party mailing list