From e72394ddebc3adb0294aab90c7b3350232af6e36bc05c003b27edbb933cc9387 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 12 Mar 2010 00:54:43 +0000 Subject: [PATCH] Accepting request 34609 from Emulators checked in (request 34609) OBS-URL: https://build.opensuse.org/request/show/34609 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=25 --- ...strcpy-by-memcpy-due-to-slightly-und.patch | 41 +++++++++++++++++++ wine-1.1.38.tar.bz2 | 3 ++ wine-1.1.40.tar.bz2 | 3 -- wine.changes | 24 ----------- wine.spec | 6 ++- 5 files changed, 48 insertions(+), 29 deletions(-) create mode 100644 0001-shell32-replace-strcpy-by-memcpy-due-to-slightly-und.patch create mode 100644 wine-1.1.38.tar.bz2 delete mode 100644 wine-1.1.40.tar.bz2 diff --git a/0001-shell32-replace-strcpy-by-memcpy-due-to-slightly-und.patch b/0001-shell32-replace-strcpy-by-memcpy-due-to-slightly-und.patch new file mode 100644 index 0000000..8c9f373 --- /dev/null +++ b/0001-shell32-replace-strcpy-by-memcpy-due-to-slightly-und.patch @@ -0,0 +1,41 @@ +From 4832105237c48b22caaaecd24f2b48e4c2b9bc8e Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Mon, 15 Feb 2010 17:23:05 +0100 +Subject: [PATCH] shell32: replace strcpy by memcpy due to slightly undefined struct handling + +Hi, + +Writing over the end of a struct is only clearly defined if the struct +is standalone and not contained in another. + +So for gcc 4.5 the strcpy triggers a fortify overflow error and we +better use memcpy. + +Ciao, Marcus +--- + dlls/shell32/pidl.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c +index 3e61144..4b8858b 100644 +--- a/dlls/shell32/pidl.c ++++ b/dlls/shell32/pidl.c +@@ -1600,13 +1600,13 @@ LPITEMIDLIST _ILCreateEntireNetwork(void) + + TRACE("\n"); + +- pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[sizeof("Entire Network")])); ++ pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[strlen("Entire Network")+1])); + if (pidlOut) + { + LPPIDLDATA pData = _ILGetDataPointer(pidlOut); + + pData->u.network.dummy = 0; +- strcpy(pData->u.network.szNames, "Entire Network"); ++ memcpy(pData->u.network.szNames, "Entire Network", strlen("Entire Network")+1); + } + return pidlOut; + } +-- +1.6.6.1 + diff --git a/wine-1.1.38.tar.bz2 b/wine-1.1.38.tar.bz2 new file mode 100644 index 0000000..9c3c617 --- /dev/null +++ b/wine-1.1.38.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf11770cd18d45d2f56235efb0f17c82d24faae43383e1d99b2975dcff3ec8a6 +size 16233995 diff --git a/wine-1.1.40.tar.bz2 b/wine-1.1.40.tar.bz2 deleted file mode 100644 index 42cf1c8..0000000 --- a/wine-1.1.40.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ad6c3ef77a523d17b778cbe4f2169e46e3f804d8d6f998f5e2965eae800f2b3 -size 16467405 diff --git a/wine.changes b/wine.changes index ad01458..d5e04bc 100644 --- a/wine.changes +++ b/wine.changes @@ -1,27 +1,3 @@ -------------------------------------------------------------------- -Fri Mar 5 23:30:10 CET 2010 - meissner@suse.de - -- Updated to 1.1.40 - - Support for Wow64 registry redirection. - - Increased coverage of MSI standard actions. - - Various Wordpad improvements. - - Many shell fixes for better IE support. - - Improved support for typelibs. - - Better GL card detection. - - Various bug fixes. -- recommend wine-mp3 - -------------------------------------------------------------------- -Fri Feb 19 19:36:41 CET 2010 - meissner@suse.de - -- Updated to 1.1.39 - - Support for registry symbolic links. - - Many MSI fixes. - - Build process improvements. - - MSXML cleanups and fixes. - - A number of MSHTML improvements. - - Various bug fixes. - ------------------------------------------------------------------- Thu Feb 18 17:25:22 CET 2010 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 82870bb..2255e8a 100644 --- a/wine.spec +++ b/wine.spec @@ -22,7 +22,7 @@ BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.40 +Version: 1.1.38 Release: 2 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -30,7 +30,8 @@ Source0: wine-%version.tar.bz2 Source1: http://kegel.com/wine/winetricks Source3: README.SuSE Source4: wine.desktop -Recommends: wine-gecko wine-mp3 +Patch0: 0001-shell32-replace-strcpy-by-memcpy-due-to-slightly-und.patch +Recommends: wine-gecko BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libXcursor.so.1 libXi.so.6 libXxf86vm.so.1 libXrender.so.1 libXrandr.so.2 libXinerama.so.1 libXcomposite.so.1 libxslt.so.1 libhal.so.1 libncurses.so.5 libfreetype.so.6 libpng12.so.0 libjpeg.so.62 libcrypto.so.0.9.8 libssl.so.0.9.8 libfontconfig.so.1 libcups.so.2 libgnutls.so.26 ExclusiveArch: %ix86 @@ -65,6 +66,7 @@ libraries. %prep %setup -q +%patch0 -p1 # cp %{S:3} . #