From 003ab78fe42c6ed3bd3ddab18ba290ae2e6b2a32 Mon Sep 17 00:00:00 2001 From: eroen Date: Mon, 3 Mar 2014 21:50:34 +0100 Subject: wine-1.7.13 - teso patch --- ...wine-1.7.2-crypt32-Skip-unknown-item-when.patch | 27 ++++++++++++++++++++++ app-emulation/wine/metadata.xml | 1 + app-emulation/wine/wine-1.7.13.ebuild | 6 ++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 app-emulation/wine/files/wine-1.7.2-crypt32-Skip-unknown-item-when.patch diff --git a/app-emulation/wine/files/wine-1.7.2-crypt32-Skip-unknown-item-when.patch b/app-emulation/wine/files/wine-1.7.2-crypt32-Skip-unknown-item-when.patch new file mode 100644 index 00000000..d53920ad --- /dev/null +++ b/app-emulation/wine/files/wine-1.7.2-crypt32-Skip-unknown-item-when.patch @@ -0,0 +1,27 @@ +From 24a36ed47bfbddf83da5aaf9df1cfbe3fac59d80 Mon Sep 17 00:00:00 2001 +From: Charles Davis +Date: Sun, 1 Sep 2013 23:39:41 -0600 +Subject: [PATCH] crypt32: Skip unknown item when decoding a CMS certificate. +Reply-To: Wine Developer's List + +I ran into this while trying to run Star Citizen under Wine. +--- + dlls/crypt32/decode.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c +index e5f8baf..3561700 100644 +--- a/dlls/crypt32/decode.c ++++ b/dlls/crypt32/decode.c +@@ -5502,6 +5502,8 @@ static BOOL CRYPT_AsnDecodeCMSSignerInfoInternal(const BYTE *pbEncoded, + offsetof(CMSG_CMS_SIGNER_INFO, AuthAttrs), + CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), + TRUE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, AuthAttrs.rgAttr), 0 }, ++ /* Unknown item */ ++ { ASN_CONSTRUCTOR | ASN_UNIVERSAL | 0x11, 0, NULL, 0, TRUE, FALSE, 0, 0 }, + { ASN_SEQUENCEOF, offsetof(CMSG_CMS_SIGNER_INFO, HashEncryptionAlgorithm), + CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), + FALSE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, +-- +1.7.12.4 + diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml index 1cbc7086..82686b5b 100644 --- a/app-emulation/wine/metadata.xml +++ b/app-emulation/wine/metadata.xml @@ -25,6 +25,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n http://wiki.winehq.org/NtlmAuthSetupGuide and http://wiki.winehq.org/NtlmSigningAndSealing Enable patch to run SWTOR + Enable patch to run The Elder Scrolls Online Support dynamic storage devices using sys-fs/udisks Build a 32bit version of Wine (won't run Win64 binaries) Build a 64bit version of Wine (won't run Win32 binaries) diff --git a/app-emulation/wine/wine-1.7.13.ebuild b/app-emulation/wine/wine-1.7.13.ebuild index 48de286c..6357e897 100644 --- a/app-emulation/wine/wine-1.7.13.ebuild +++ b/app-emulation/wine/wine-1.7.13.ebuild @@ -39,7 +39,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl swtor test +threads +truetype +udisks v4l +X xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl swtor teso test +threads +truetype +udisks v4l +X xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) @@ -277,6 +277,10 @@ src_prepare() { use swtor && PATCHES+=( "${FILESDIR}"/${PN}-1.7.1-KUSER_SHARED_DATA_18.patch ) + # http://bugs.winehq.org/show_bug.cgi?id=34388 + use teso && PATCHES+=( + "${FILESDIR}"/${PN}-1.7.2-crypt32-Skip-unknown-item-when.patch + ) autotools-utils_src_prepare -- cgit v1.2.1