update to 2.62.0-1

1 files changed, 97 insertions, 81 deletions

diff --git a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
index 17f9895eadda..201ee1d4ee8f 100644
--- a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
+++ b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
@@ -1,6 +1,28 @@
---- glib-2.57.2/glib/gstdio.c.orig	2018-07-31 20:31:07.000000000 +0200
-+++ glib-2.57.2/glib/gstdio.c	2018-08-03 16:32:42.447575300 +0200
-@@ -758,6 +758,11 @@
+From 7f4f4354540440c0a8a37beaccbec8bc7fc15ec7 Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro@fedoraproject.org>
+Date: Mon, 27 Aug 2012 23:28:54 +0200
+Subject: [PATCH] Use CreateFile on Win32 to make sure g_unlink always works
+
+The functions g_open(), g_creat() and g_fopen() defer to _wopen(),
+_wcreat() and _wfopen() respectively. This is very similar to
+the corresponding arrangement for Linux. However, those Windows
+functions do not support renaming a file whilst it's open. As a
+result, g_rename() behaves differently on the Windows platform
+compared to its Linux behaviour, where files can be renamed even
+while there are file handles still open. Resolved this by using
+the Win32 API function CreateFile() instead of _wopen(), _wcreat()
+and _wfopen()
+
+Patch initially created by John Emmas
+---
+ glib/gstdio.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 235 insertions(+), 29 deletions(-)
+
+diff --git a/glib/gstdio.c b/glib/gstdio.c
+index 653c8a3..26e8158 100644
+--- a/glib/gstdio.c
++++ b/glib/gstdio.c
+@@ -1035,6 +1035,11 @@ g_open (const gchar *filename,
  	int          mode)
  {
  #ifdef G_OS_WIN32
@@ -8,11 +30,11 @@
 +  DWORD  dwDesiredAccess       = 0;
 +  DWORD  dwFlagsAndAttributes  = 0;
 +  DWORD  dwDisposition         = OPEN_EXISTING;
-+  DWORD  dwSharedAccess        = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
++  DWORD  dwSharedAccess        = FILE_SHARE_READ | FILE_SHARE_DELETE;
    wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
    int retval;
    int save_errno;
-@@ -768,12 +773,114 @@
+@@ -1045,12 +1050,114 @@ g_open (const gchar *filename,
        return -1;
      }
  
@@ -28,45 +50,44 @@
 +  {
 +    /* Equates to _O_RDONLY */
 +    if (flags & _O_TRUNC)
-+    {
-+      errno = EINVAL;
-+      g_free (wfilename);
-+      return -1;
-+    }
- 
--  g_free (wfilename);
-+    dwDesiredAccess |= GENERIC_READ;
-+    dwSharedAccess  |= FILE_SHARE_WRITE;
++	{
++	  errno = EINVAL;
++	  g_free (wfilename);
++	  return -1;
++	}
++
++	dwDesiredAccess |= GENERIC_READ;
++	dwSharedAccess  |= FILE_SHARE_WRITE;
 +  }
 +  if (flags & _O_WRONLY)
 +  {
 +    if (flags & _O_RDWR)
-+    {
-+      errno = EINVAL;
-+      g_free (wfilename);
-+      return -1;
-+    }
- 
-+    dwDesiredAccess |= GENERIC_WRITE;
++	{
++	  errno = EINVAL;
++	  g_free (wfilename);
++	  return -1;
++	}
++
++	dwDesiredAccess |= GENERIC_WRITE;
 +  }
 +  if (flags & _O_RDWR)
 +  {
-+    dwDesiredAccess |= GENERIC_READ;
-+    dwDesiredAccess |= GENERIC_WRITE;
++	dwDesiredAccess |= GENERIC_READ;
++	dwDesiredAccess |= GENERIC_WRITE;
 +  }
 +  if (flags & _O_TRUNC)
 +  {
 +    if (flags & _O_CREAT)
-+      dwDisposition = CREATE_ALWAYS;
-+    else
-+      dwDisposition = TRUNCATE_EXISTING;
++	  dwDisposition = CREATE_ALWAYS;
++	else
++	  dwDisposition = TRUNCATE_EXISTING;
 +  }
 +  if ((flags & _O_CREAT) && !(flags & _O_TRUNC))
 +  {
 +    if (flags & _O_EXCL)
-+      dwDisposition = CREATE_NEW;
-+    else
-+      dwDisposition = OPEN_ALWAYS;
++	  dwDisposition = CREATE_NEW;
++	else
++	  dwDisposition = OPEN_ALWAYS;
 +  }
 +  if (flags & _O_CREAT)
 +  {
@@ -85,7 +106,8 @@
 +  {
 +    dwFlagsAndAttributes |= FILE_FLAG_RANDOM_ACCESS;
 +  }
-+
+ 
+-  g_free (wfilename);
 +  if (0 == dwFlagsAndAttributes)
 +    dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL;
 +  hFile = CreateFileW(wfilename, dwDesiredAccess, dwSharedAccess, NULL, dwDisposition, dwFlagsAndAttributes, NULL);
@@ -111,7 +133,7 @@
 +  }
 +  else
 +    retval = _open_osfhandle((long)hFile, flags);
-+
+ 
 +  if ((-1) != retval)
 +  {
 +    /* We have a valid file handle. Set its translation mode to text or binary, as appropriate */
@@ -130,7 +152,7 @@
    return retval;
  #else
    int fd;
-@@ -821,6 +928,8 @@
+@@ -1098,6 +1205,8 @@ g_creat (const gchar *filename,
  	 int          mode)
  {
  #ifdef G_OS_WIN32
@@ -139,7 +161,7 @@
    wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
    int retval;
    int save_errno;
-@@ -831,12 +940,41 @@
+@@ -1108,12 +1217,41 @@ g_creat (const gchar *filename,
        return -1;
      }
  
@@ -150,10 +172,11 @@
 +    if (! (mode & _S_IWRITE))
 +      dwFlagsAndAttributes  = FILE_ATTRIBUTE_READONLY; /* Sets file to 'read only' after the file gets closed */
 +  }
-+
+ 
+-  g_free (wfilename);
 +  hFile = CreateFileW(wfilename, (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_READ | FILE_SHARE_DELETE),
 +                                  NULL, CREATE_ALWAYS, dwFlagsAndAttributes, NULL);
-+
+ 
 +  if (INVALID_HANDLE_VALUE == hFile)
 +  {
 +    retval = (-1);
@@ -175,52 +198,32 @@
 +  }
 +  else
 +    retval = _open_osfhandle((long)hFile, _O_RDWR);
- 
++
 +  save_errno = errno;
-   g_free (wfilename);
--
++  g_free (wfilename);
    errno = save_errno;
 +
    return retval;
  #else
    return creat (filename, mode);
-@@ -1286,36 +1424,102 @@
+@@ -1550,34 +1688,102 @@ g_fopen (const gchar *filename,
  	 const gchar *mode)
  {
  #ifdef G_OS_WIN32
 -  wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
 -  wchar_t *wmode;
--  gchar   *mode2;
 -  FILE *retval;
 -  int save_errno;
--
++  int   hFile;
++  int   flags  = 0;
++  gchar priv_mode[4];
++  FILE *retval = NULL;
+ 
 -  if (wfilename == NULL)
 -    {
 -      errno = EINVAL;
 -      return NULL;
 -    }
--
--  mode2 = _g_win32_get_mode_alias (mode);
--  wmode = g_utf8_to_utf16 (mode2, -1, NULL, NULL, NULL);
--  g_free (mode2);
--
--  if (wmode == NULL)
--    {
--      g_free (wfilename);
--      errno = EINVAL;
--      return NULL;
--    }
--
--  retval = _wfopen (wfilename, wmode);
--  save_errno = errno;
--
--  g_free (wfilename);
--  g_free (wmode);
-+  int   hFile;
-+  int   flags  = 0;
-+  gchar priv_mode[4];
-+  FILE *retval = NULL;
-+
 +  if ((NULL == filename) || (NULL == mode))
 +  {
 +    errno = EINVAL;
@@ -228,20 +231,25 @@
 +  }
 +  if ((strlen(mode) < 1) || (strlen(mode) > 3))
 +  {
-+    errno = EINVAL;
++    errno - EINVAL;
 +    goto out;
 +  }
-+
+ 
+-  wmode = g_utf8_to_utf16 (mode, -1, NULL, NULL, NULL);
 +  strncpy(priv_mode, mode, 3);
 +  priv_mode[3] = '\0';
-+
+ 
+-  if (wmode == NULL)
 +  /* Set up any flags to pass to 'g_open()' */
 +  if (3 == strlen(priv_mode))
 +  {
 +    if (('c' == priv_mode[2]) || ('n' == priv_mode[2]))
 +      priv_mode[2] = '\0';
 +    else
-+    {
+     {
+-      g_free (wfilename);
+-      errno = EINVAL;
+-      return NULL;
 +      if (0 == strcmp(priv_mode, "a+b"))
 +        flags = _O_RDWR | _O_CREAT | _O_APPEND | _O_BINARY;
 +      else if (0 == strcmp(priv_mode, "a+t"))
@@ -255,11 +263,20 @@
 +      else if (0 == strcmp(priv_mode, "w+t"))
 +        flags = _O_RDWR | _O_CREAT |_O_TRUNC | _O_TEXT;
 +      else
-+      {
-+        errno = EINVAL;
++	  {
++	    errno = EINVAL;
 +        goto out;
-+      }
-+    }
++	  }
+     }
+-
+-  _g_win32_fix_mode (wmode);
+-  retval = _wfopen (wfilename, wmode);
+-  save_errno = errno;
+-
+-  g_free (wfilename);
+-  g_free (wmode);
+-
+-  errno = save_errno;
 +  }
 +  if (2 == strlen(priv_mode))
 +  {
@@ -282,10 +299,10 @@
 +      else if (0 == strcmp(priv_mode, "wt"))
 +        flags = _O_WRONLY | _O_CREAT | _O_TRUNC | _O_TEXT;
 +      else
-+      {
-+        errno = EINVAL;
++	  {
++	    errno = EINVAL;
 +        goto out;
-+      }
++	  }
 +    }
 +  }
 +  if (1 == strlen(priv_mode))
@@ -297,21 +314,20 @@
 +    else if (0 == strcmp(priv_mode, "w"))
 +      flags = _O_WRONLY | _O_CREAT | _O_TRUNC;
 +    else if ( !((0 == strcmp(priv_mode, "c")) || (0 == strcmp(priv_mode, "n"))))
-+    {
-+      errno = EINVAL;
++	{
++	  errno = EINVAL;
 +      goto out;
-+    }
++	}
 +  }
-+
++ 
 +  hFile = g_open (filename, flags, (_S_IREAD | _S_IWRITE));
-+
++ 
 +  if (INVALID_HANDLE_VALUE == (HANDLE)hFile)
 +    /* 'errno' will have already been set by 'g_open()' */
 +    retval = NULL;
 +  else
 +    retval = _fdopen(hFile, mode);
- 
--  errno = save_errno;
++ 
 +out:
    return retval;
  #else