[pkg-wine-party] [wine] 01/01: Drop file-handling.patch.

Jens Reyer jreyer-guest at moszumanska.debian.org
Tue Dec 15 19:42:50 UTC 2015


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

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

commit 44708cca25b05349ea215b14c2854e4b442971e7
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Tue Dec 15 19:31:16 2015 +0100

    Drop file-handling.patch.
    
    Fixed upstream according to Sebastian Lackner:
    https://bugs.winehq.org/show_bug.cgi?id=39744#c17
---
 debian/patches/file-handling.patch | 22 ----------------------
 debian/patches/series              |  1 -
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/file-handling.patch b/debian/patches/file-handling.patch
deleted file mode 100644
index 8fd063d..0000000
--- a/debian/patches/file-handling.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-description: fix opening read-only files with FILE_DELETE_ON_CLOSE
-author: Sebastian Lackner <sebastian at fds-team.de>
-origin: https://github.com/wine-compholio/wine-staging/blob/master/patches/server-Delete_On_Close/0001-server-Fix-handling-of-opening-read-only-files-with-.patch
-
---- a/server/fd.c
-+++ b/server/fd.c
-@@ -1834,6 +1834,15 @@ struct fd *open_fd( struct fd *root, con
-         list_add_head( &inode->open, &fd->inode_entry );
-         closed_fd = NULL;
- 
-+        /* can't unlink files we don't have permission to access */
-+        if ((options & FILE_DELETE_ON_CLOSE) && S_ISREG(st.st_mode) &&
-+            !(flags & O_CREAT) && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
-+        {
-+            /* FIXME: instead of checking for O_CREAT it should check if the file was created */
-+            set_error( STATUS_CANNOT_DELETE );
-+            goto error;
-+        }
-+
-         /* check directory options */
-         if ((options & FILE_DIRECTORY_FILE) && !S_ISDIR(st.st_mode))
-         {
diff --git a/debian/patches/series b/debian/patches/series
index 669f06a..11421cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,6 +18,5 @@ glu32.patch
 opengl.patch
 openal.patch
 
-file-handling.patch
 font-divbyzero.patch
 printer-resolution.patch

-- 
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