Hello community, here is the log from the commit of package wine checked in at Mon May 15 19:05:05 CEST 2006. -------- --- arch/i386/wine/wine.changes 2006-04-11 16:54:58.000000000 +0200 +++ wine/wine.changes 2006-05-15 14:18:22.000000000 +0200 @@ -1,0 +2,23 @@ +Mon May 15 14:17:34 CEST 2006 - meissner@suse.de + +- Upstream 0.9.13 + - New GPhoto backend for TWAIN. + - Dynamic drive configuration using HAL. + - A gazillion Direct3D fixes. + - New TCP transport for RPC. + - Lots of bug fixes. +- Added libgphoto2 and hal development libs to BuildRequires. +- personality hack to avoid virtual ram ulimits now seperate. + +------------------------------------------------------------------- +Mon Apr 17 22:43:47 CEST 2006 - meissner@suse.de + +- Upstream 0.9.12: + - New Winelib Internet Explorer application (all 5 lines of it). + - Several improvements to the font support. + - More work on the IDL compiler. + - Faster drawing of the cards in Solitaire (very important feature). + - A number of fixes for issues found by the Coverity code cheker. + - Lots of bug fixes. + +------------------------------------------------------------------- Old: ---- wine-0.9.11.diff wine-0.9.11.tar.bz2 New: ---- personality.patch wine-0.9.13.diff wine-0.9.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.u4Qhdt/_old 2006-05-15 19:04:55.000000000 +0200 +++ /var/tmp/diff_new_pack.u4Qhdt/_new 2006-05-15 19:04:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 0.9.11) +# spec file for package wine (Version 0.9.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,18 +11,19 @@ # norootforbuild Name: wine -BuildRequires: alsa-devel audiofile capi4linux cups-devel desktop-file-utils fontforge freeglut-devel freetype2-devel giflib-devel jack-devel libdrm-devel libicu-devel liblcms-devel libpng-devel libtiff-devel libxslt-devel openldap2-devel prelink update-desktop-files +BuildRequires: alsa-devel audiofile capi4linux cups-devel desktop-file-utils fontforge freeglut-devel freetype2-devel giflib-devel hal-devel jack-devel libdrm-devel libgphoto2 libicu-devel liblcms-devel libpng-devel libtiff-devel libxslt-devel openldap2-devel prelink update-desktop-files License: LGPL, Other License(s), see package Group: System/Emulators/PC Autoreqprov: on -Version: 0.9.11 -Release: 2 +Version: 0.9.13 +Release: 1 Summary: An MS Windows emulator URL: http://www.winehq.com Source0: wine-%version.tar.bz2 Source3: README.SuSE Source4: wine.desktop Patch0: wine-%version.diff +Patch1: personality.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,6 +56,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # cp %{S:3} . # @@ -65,7 +67,7 @@ %build rm -f ./config.cache autoconf -CFLAGS="-DLDAP_DEPRECATED=1 ${RPM_OPT_FLAGS}" \ +CFLAGS="${RPM_OPT_FLAGS}" \ ./configure --prefix=/usr --mandir=$RPM_BUILD_ROOT/%{_mandir} make %{?jobs:-j%jobs} depend make %{?jobs:-j%jobs} all @@ -104,6 +106,23 @@ /usr/share/aclocal/wine.m4 %changelog -n wine +* Mon May 15 2006 - meissner@suse.de +- Upstream 0.9.13 +- New GPhoto backend for TWAIN. +- Dynamic drive configuration using HAL. +- A gazillion Direct3D fixes. +- New TCP transport for RPC. +- Lots of bug fixes. +- Added libgphoto2 and hal development libs to BuildRequires. +- personality hack to avoid virtual ram ulimits now seperate. +* Mon Apr 17 2006 - meissner@suse.de +- Upstream 0.9.12: +- New Winelib Internet Explorer application (all 5 lines of it). +- Several improvements to the font support. +- More work on the IDL compiler. +- Faster drawing of the cards in Solitaire (very important feature). +- A number of fixes for issues found by the Coverity code cheker. +- Lots of bug fixes. * Tue Apr 11 2006 - meissner@suse.de - upstream 0.9.11: - Fake dll files created in the system directory to help installers. ++++++ personality.patch ++++++ diff -ruN -x CVS wine-0.9.11/loader/preloader.c marcus-wine-0.9.11/loader/preloader.c --- wine-0.9.11/loader/preloader.c 2006-02-15 17:42:21.000000000 +0100 +++ marcus-wine-0.9.11/loader/preloader.c 2006-03-30 11:44:16.000000000 +0200 @@ -208,6 +208,14 @@ return SYSCALL_RET(ret); } +static inline int wld_personality( int perso ) +{ + int ret; + __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" + : "=a" (ret) : "0" (SYS_personality), "r" (perso) ); + return SYSCALL_RET(ret); +} + static inline ssize_t wld_read( int fd, void *buffer, size_t len ) { int ret; @@ -226,6 +234,14 @@ return SYSCALL_RET(ret); } +static inline int wld_execve( const char * path, char **argv, char ** envp ) +{ + int ret; + __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" + : "=a" (ret) : "0" (SYS_execve), "r" (path), "c" (argv), "d" (envp) ); + return SYSCALL_RET(ret); +} + static inline int wld_mprotect( const void *addr, size_t len, int prot ) { int ret; @@ -914,6 +930,7 @@ ElfW(auxv_t) new_av[12], delete_av[3], *av; struct wld_link_map main_binary_map, ld_so_map; struct wine_preload_info **wine_main_preload_info; + unsigned int perso; pargc = *stack; argv = (char **)pargc + 1; @@ -922,6 +939,19 @@ /* skip over the parameters */ p = argv + *pargc + 1; + perso = wld_personality(0xffffffff); + if (!(perso & 0x200000)) { + unsigned int newperso; + wld_personality(perso | 0x200000); + newperso = wld_personality(0xffffffff); + /* only execve() if the personality changed, otherwise we will loop */ + if (newperso != perso) { + wld_execve(argv[0],argv,p); + fatal_error( "Failed execve %s\n", argv[0] ); + return NULL; + } + } + /* skip over the environment */ while (*p) { ++++++ wine-0.9.11.diff -> wine-0.9.13.diff ++++++ --- arch/i386/wine/wine-0.9.11.diff 2006-04-12 10:20:04.000000000 +0200 +++ wine/wine-0.9.13.diff 2006-05-15 13:20:39.000000000 +0200 @@ -1,7 +1,7 @@ -diff -ruN -x CVS wine-0.9.11/dlls/gdi/freetype.c marcus-wine-0.9.11/dlls/gdi/freetype.c ---- wine-0.9.11/dlls/gdi/freetype.c 2006-03-31 14:10:28.000000000 +0200 -+++ marcus-wine-0.9.11/dlls/gdi/freetype.c 2006-03-31 14:09:25.000000000 +0200 -@@ -455,9 +455,17 @@ +diff -ruN -x CVS wine-0.9.13/dlls/gdi/freetype.c marcus-wine-0.9.13/dlls/gdi/freetype.c +--- wine-0.9.13/dlls/gdi/freetype.c 2006-05-11 20:01:00.000000000 +0200 ++++ marcus-wine-0.9.13/dlls/gdi/freetype.c 2006-05-06 16:26:35.000000000 +0200 +@@ -699,9 +699,17 @@ int i, bitmap_num, internal_leading; FONTSIGNATURE fs; @@ -19,20 +19,10 @@ TRACE("Loading font file %s index %ld\n", debugstr_a(file), face_index); if((err = pFT_New_Face(library, file, face_index, &ft_face)) != 0) { WARN("Unable to load font file %s err = %x\n", debugstr_a(file), err); -@@ -1049,7 +1057,8 @@ - - dir = opendir(dirname); - if(!dir) { -- ERR("Can't open directory %s\n", debugstr_a(dirname)); -+ /* might just be a long list of possible directories, so not ERR */ -+ WARN("Can't open directory %s\n", debugstr_a(dirname)); - return FALSE; - } - while((dent = readdir(dir)) != NULL) { -diff -ruN -x CVS wine-0.9.11/dlls/opengl32/wgl.c marcus-wine-0.9.11/dlls/opengl32/wgl.c ---- wine-0.9.11/dlls/opengl32/wgl.c 2006-03-30 11:47:50.000000000 +0200 -+++ marcus-wine-0.9.11/dlls/opengl32/wgl.c 2006-03-31 11:54:59.000000000 +0200 -@@ -535,15 +535,29 @@ +diff -ruN -x CVS wine-0.9.13/dlls/opengl32/wgl.c marcus-wine-0.9.13/dlls/opengl32/wgl.c +--- wine-0.9.13/dlls/opengl32/wgl.c 2006-05-11 20:01:17.000000000 +0200 ++++ marcus-wine-0.9.13/dlls/opengl32/wgl.c 2006-05-11 19:57:42.000000000 +0200 +@@ -548,15 +548,29 @@ BOOL ret; DWORD type = GetObjectType(hdc); @@ -63,7 +53,7 @@ if (ctx->ctx == NULL) { int draw_vis_id, ctx_vis_id; VisualID visualid = (VisualID)GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" ); -@@ -569,7 +583,7 @@ +@@ -582,7 +596,7 @@ } TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } @@ -72,10 +62,10 @@ ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx); NtCurrentTeb()->glContext = ctx; if(ret && type == OBJ_MEMDC) -diff -ruN -x CVS wine-0.9.11/libs/wine/mmap.c marcus-wine-0.9.11/libs/wine/mmap.c ---- wine-0.9.11/libs/wine/mmap.c 2006-02-15 17:42:21.000000000 +0100 -+++ marcus-wine-0.9.11/libs/wine/mmap.c 2006-02-08 16:46:47.000000000 +0100 -@@ -301,6 +301,7 @@ +diff -ruN -x CVS wine-0.9.13/libs/wine/mmap.c marcus-wine-0.9.13/libs/wine/mmap.c +--- wine-0.9.13/libs/wine/mmap.c 2006-05-11 20:01:46.000000000 +0200 ++++ marcus-wine-0.9.13/libs/wine/mmap.c 2006-05-06 16:27:11.000000000 +0200 +@@ -313,6 +313,7 @@ } } @@ -83,7 +73,7 @@ if (stack_ptr >= user_space_limit) { char *base = stack_ptr - ((unsigned int)stack_ptr & granularity_mask) - (granularity_mask + 1); -@@ -314,6 +315,7 @@ +@@ -326,6 +327,7 @@ reserve_area( base, 0 ); } else reserve_area( user_space_limit, 0 ); @@ -91,71 +81,10 @@ #endif /* __i386__ */ /* reserve the DOS area if not already done */ -diff -ruN -x CVS wine-0.9.11/loader/preloader.c marcus-wine-0.9.11/loader/preloader.c ---- wine-0.9.11/loader/preloader.c 2006-02-15 17:42:21.000000000 +0100 -+++ marcus-wine-0.9.11/loader/preloader.c 2006-03-30 11:44:16.000000000 +0200 -@@ -208,6 +208,14 @@ - return SYSCALL_RET(ret); - } - -+static inline int wld_personality( int perso ) -+{ -+ int ret; -+ __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" -+ : "=a" (ret) : "0" (SYS_personality), "r" (perso) ); -+ return SYSCALL_RET(ret); -+} -+ - static inline ssize_t wld_read( int fd, void *buffer, size_t len ) - { - int ret; -@@ -226,6 +234,14 @@ - return SYSCALL_RET(ret); - } - -+static inline int wld_execve( const char * path, char **argv, char ** envp ) -+{ -+ int ret; -+ __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" -+ : "=a" (ret) : "0" (SYS_execve), "r" (path), "c" (argv), "d" (envp) ); -+ return SYSCALL_RET(ret); -+} -+ - static inline int wld_mprotect( const void *addr, size_t len, int prot ) - { - int ret; -@@ -914,6 +930,7 @@ - ElfW(auxv_t) new_av[12], delete_av[3], *av; - struct wld_link_map main_binary_map, ld_so_map; - struct wine_preload_info **wine_main_preload_info; -+ unsigned int perso; - - pargc = *stack; - argv = (char **)pargc + 1; -@@ -922,6 +939,19 @@ - /* skip over the parameters */ - p = argv + *pargc + 1; - -+ perso = wld_personality(0xffffffff); -+ if (!(perso & 0x200000)) { -+ unsigned int newperso; -+ wld_personality(perso | 0x200000); -+ newperso = wld_personality(0xffffffff); -+ /* only execve() if the personality changed, otherwise we will loop */ -+ if (newperso != perso) { -+ wld_execve(argv[0],argv,p); -+ fatal_error( "Failed execve %s\n", argv[0] ); -+ return NULL; -+ } -+ } -+ - /* skip over the environment */ - while (*p) - { -diff -ruN -x CVS wine-0.9.11/programs/winecfg/audio.c marcus-wine-0.9.11/programs/winecfg/audio.c ---- wine-0.9.11/programs/winecfg/audio.c 2006-03-23 11:29:22.000000000 +0100 -+++ marcus-wine-0.9.11/programs/winecfg/audio.c 2006-03-30 11:44:46.000000000 +0200 -@@ -573,7 +573,7 @@ +diff -ruN -x CVS wine-0.9.13/programs/winecfg/audio.c marcus-wine-0.9.13/programs/winecfg/audio.c +--- wine-0.9.13/programs/winecfg/audio.c 2006-05-11 20:01:51.000000000 +0200 ++++ marcus-wine-0.9.13/programs/winecfg/audio.c 2006-05-11 19:57:48.000000000 +0200 +@@ -591,7 +591,7 @@ buf = get_reg_key(config_key, "Drivers", "Audio", NULL); /* check for first time install and set a default driver @@ -164,7 +93,7 @@ */ if (buf == NULL) { -@@ -582,9 +582,9 @@ +@@ -600,9 +600,9 @@ /* select oss if available */ for (pAudioDrv = loadedAudioDrv; *pAudioDrv->szName; pAudioDrv++) { @@ -176,7 +105,7 @@ break; } } -@@ -594,9 +594,9 @@ +@@ -612,9 +612,9 @@ /* select alsa if available */ for (pAudioDrv = loadedAudioDrv; *pAudioDrv->szName; pAudioDrv++) { @@ -188,10 +117,10 @@ break; } } -diff -ruN -x CVS wine-0.9.11/server/registry.c marcus-wine-0.9.11/server/registry.c ---- wine-0.9.11/server/registry.c 2006-03-23 11:29:23.000000000 +0100 -+++ marcus-wine-0.9.11/server/registry.c 2006-03-23 11:26:23.000000000 +0100 -@@ -1622,7 +1622,7 @@ +diff -ruN -x CVS wine-0.9.13/server/registry.c marcus-wine-0.9.13/server/registry.c +--- wine-0.9.13/server/registry.c 2006-04-12 18:11:04.000000000 +0200 ++++ marcus-wine-0.9.13/server/registry.c 2006-04-07 14:00:07.000000000 +0200 +@@ -1623,7 +1623,7 @@ for (;;) { sprintf( p, "reg%lx%04x.tmp", (long) getpid(), count++ ); @@ -200,9 +129,9 @@ if (errno != EEXIST) goto done; close( fd ); } -diff -ruN -x CVS wine-0.9.11/tools/wineprefixcreate.in marcus-wine-0.9.11/tools/wineprefixcreate.in ---- wine-0.9.11/tools/wineprefixcreate.in 2006-03-23 11:29:23.000000000 +0100 -+++ marcus-wine-0.9.11/tools/wineprefixcreate.in 2006-03-23 11:26:24.000000000 +0100 +diff -ruN -x CVS wine-0.9.13/tools/wineprefixcreate.in marcus-wine-0.9.13/tools/wineprefixcreate.in +--- wine-0.9.13/tools/wineprefixcreate.in 2006-03-23 11:29:23.000000000 +0100 ++++ marcus-wine-0.9.13/tools/wineprefixcreate.in 2006-03-23 11:26:24.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ++++++ wine-0.9.11.tar.bz2 -> wine-0.9.13.tar.bz2 ++++++ arch/i386/wine/wine-0.9.11.tar.bz2 wine/wine-0.9.13.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...