Cleanup patches directory master
authorAndre Heinecke <aheinecke@intevation.de>
Wed, 22 Oct 2014 11:17:39 +0000 (13:17 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Wed, 22 Oct 2014 11:58:50 +0000 (13:58 +0200)
    * patches/claws-mail-3.8.1: Remove symlink.
    * patches/glib-2.20.0/01-socket.patch,
    patches/glib-2.24.0/01-socket.patch: Remove patches for old
    versions.
    * patches/gpgol-1.1.3/01-w64-ming64.patch,
    patches/gpgol-1.1.3/02-off_t.postcfg-build,
    patches/gtk+-2.24.17/01-utf-conv-crash.patch
    patches/gtk+-2.24.17/02-crlf.patch
    patches/libetpan-0.57/01-gnutls_compat.patch
    patches/libgpg-error-1.12/01-fix-get-string.patch
    patches/libxml2-2.7.8/01-cve-2012-5134: Remove paches included
    in currently used upstream versions.
    * Makefile.am (EXTRA_DIST): Update accordingly.

--
    The intention is to get a better overview of the patches
    we are still shipping. For old versions the git history
    should be enough.

Makefile.am
patches/claws-mail-3.8.1 [deleted symlink]
patches/glib-2.20.0/01-socket.patch [deleted file]
patches/glib-2.24.0/01-socket.patch [deleted file]
patches/gpgol-1.1.3/01-w64-ming64.patch [deleted file]
patches/gpgol-1.1.3/02-off_t.postcfg-build [deleted file]
patches/gtk+-2.24.17/01-utf-conv-crash.patch [deleted file]
patches/gtk+-2.24.17/02-crlf.patch [deleted file]
patches/libetpan-0.57/01-gnutls_compat.patch [deleted file]
patches/libgpg-error-1.12/01-fix-get-string.patch [deleted file]
patches/libxml2-2.7.8/01-cve-2012-5134 [deleted file]

index 82cf007..73c7b0f 100644 (file)
@@ -36,8 +36,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/claws-mail-3.9.1/51-version-file.patch \
         patches/claws-mail-3.9.1/80-src-makefile.postcfg-build \
         patches/dirmngr-1.1.1/dirmngr-pth.patch \
-        patches/glib-2.20.0/01-socket.patch \
-        patches/glib-2.24.0/01-socket.patch \
         patches/glib-2.34.3/01-socket.patch \
         patches/glib-2.34.3/02-no-kill.patch \
         patches/gnupg2-2.0.26/0001-Enable-wildcard-expansion-with-mingw-w64.patch \
@@ -57,15 +55,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/gpa-0.9.4/04-utf-clip-crash.patch \
         patches/gpa-0.9.4/05-event-done.patch \
         patches/gpgme-1.4.4/0001-Handle-modern-keyserver-output-which-may-emit-the-fi.patch \
-        patches/gpgol-1.1.3/01-w64-ming64.patch \
-        patches/gpgol-1.1.3/02-off_t.postcfg-build \
-        patches/gtk+-2.24.17/01-utf-conv-crash.patch \
-        patches/gtk+-2.24.17/02-crlf.patch \
         patches/gtkhtml2_viewer-0.34/80-src-makefile.postcfg-build \
-        patches/libetpan-0.57/01-gnutls_compat.patch \
-        patches/libgpg-error-1.12/01-fix-get-string.patch \
         patches/libtasn1-2.14/gnulib-mingw-w64-fix.patch \
-        patches/libxml2-2.7.8/01-cve-2012-5134 \
         patches/pinentry-0.8.4-beta8/0001-Set-some-accessibility-information.patch \
         patches/pinentry-0.8.4-beta8/0002-Use-raiseWindow-also-for-confirm-dialogs.patch \
         patches/pinentry-0.8.4-beta8/0003-Add-fallbacks-for-SetForegroundWindow.patch \
diff --git a/patches/claws-mail-3.8.1 b/patches/claws-mail-3.8.1
deleted file mode 120000 (symlink)
index dc426f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-claws-mail-3.8.0cvs30/
\ No newline at end of file
diff --git a/patches/glib-2.20.0/01-socket.patch b/patches/glib-2.20.0/01-socket.patch
deleted file mode 100755 (executable)
index 06ea890..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-Fix a couple of buglets in the I/O channel implementation.
-
-diff -rup glib-2.20.0-orig/glib/giowin32.c glib-2.20.0/glib/giowin32.c
---- glib-2.20.0-orig/glib/giowin32.c   2009-03-13 05:09:59.000000000 +0100
-+++ glib-2.20.0/glib/giowin32.c        2009-04-08 15:24:59.000000000 +0200
-@@ -285,7 +285,7 @@ g_io_channel_win32_init (GIOWin32Channel
-   channel->event_mask = 0;
-   channel->last_events = 0;
--  channel->event = NULL;
-+  channel->event = WSA_INVALID_EVENT;
-   channel->write_would_have_blocked = FALSE;
-   channel->ever_writable = FALSE;
- }
-@@ -1144,7 +1144,7 @@ g_io_win32_free (GIOChannel *channel)
-         g_free (emsg);
-       }
--  if (win32_channel->event)
-+  if (win32_channel->event != WSA_INVALID_EVENT)
-     if (!WSACloseEvent (win32_channel->event))
-       if (win32_channel->debug)
-       {
-@@ -1595,7 +1595,7 @@ g_io_win32_sock_create_watch (GIOChannel
-   
-   watch->condition = condition;
--  if (win32_channel->event == 0)
-+  if (win32_channel->event == WSA_INVALID_EVENT)
-     win32_channel->event = WSACreateEvent ();
-   watch->pollfd.fd = (gintptr) win32_channel->event;
-@@ -2161,7 +2161,54 @@ g_io_channel_win32_make_pollfd (GIOChann
-       break;
-     case G_IO_WIN32_SOCKET:
--      fd->fd = (gintptr) WSACreateEvent ();
-+      if (win32_channel->event == WSA_INVALID_EVENT)
-+      win32_channel->event = WSACreateEvent ();
-+      fd->fd = (gintptr) win32_channel->event;
-+
-+      if (fd->fd == (gintptr) WSA_INVALID_EVENT)
-+      {
-+        gchar *emsg = g_win32_error_message (GetLastError ());
-+        
-+        g_error ("Error creating event: %s", emsg);
-+        g_free (emsg);
-+      }
-+      else
-+      {
-+        int event_mask = 0;
-+
-+        if (condition & G_IO_IN)
-+          event_mask |= (FD_READ | FD_ACCEPT);
-+        if (condition & G_IO_OUT)
-+          event_mask |= (FD_WRITE | FD_CONNECT);
-+        event_mask |= FD_CLOSE;
-+
-+        ResetEvent ((WSAEVENT) fd->fd);
-+
-+        if (win32_channel->debug)
-+          g_print ("WSAEventSelect(%d,%p,{%s})",
-+                   win32_channel->fd, (HANDLE) fd->fd,
-+                   event_mask_to_string (event_mask));
-+        if (WSAEventSelect (win32_channel->fd, (HANDLE) fd->fd,
-+                            event_mask) == SOCKET_ERROR)
-+          if (win32_channel->debug)
-+            {
-+              gchar *emsg = g_win32_error_message (WSAGetLastError ());
-+
-+              g_print (" failed: %s", emsg);
-+              g_free (emsg);
-+            }
-+        if (win32_channel->debug)
-+          g_print ("\n");
-+
-+        if ((event_mask & FD_WRITE) &&
-+            win32_channel->ever_writable &&
-+            !win32_channel->write_would_have_blocked)
-+          {
-+            if (win32_channel->debug)
-+              g_print ("WSASetEvent(%p)\n", (WSAEVENT) fd->fd);
-+            WSASetEvent ((WSAEVENT) fd->fd);
-+          }
-+      }
-       break;
-       
-     case G_IO_WIN32_WINDOWS_MESSAGES:
diff --git a/patches/glib-2.24.0/01-socket.patch b/patches/glib-2.24.0/01-socket.patch
deleted file mode 100755 (executable)
index 06ea890..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-Fix a couple of buglets in the I/O channel implementation.
-
-diff -rup glib-2.20.0-orig/glib/giowin32.c glib-2.20.0/glib/giowin32.c
---- glib-2.20.0-orig/glib/giowin32.c   2009-03-13 05:09:59.000000000 +0100
-+++ glib-2.20.0/glib/giowin32.c        2009-04-08 15:24:59.000000000 +0200
-@@ -285,7 +285,7 @@ g_io_channel_win32_init (GIOWin32Channel
-   channel->event_mask = 0;
-   channel->last_events = 0;
--  channel->event = NULL;
-+  channel->event = WSA_INVALID_EVENT;
-   channel->write_would_have_blocked = FALSE;
-   channel->ever_writable = FALSE;
- }
-@@ -1144,7 +1144,7 @@ g_io_win32_free (GIOChannel *channel)
-         g_free (emsg);
-       }
--  if (win32_channel->event)
-+  if (win32_channel->event != WSA_INVALID_EVENT)
-     if (!WSACloseEvent (win32_channel->event))
-       if (win32_channel->debug)
-       {
-@@ -1595,7 +1595,7 @@ g_io_win32_sock_create_watch (GIOChannel
-   
-   watch->condition = condition;
--  if (win32_channel->event == 0)
-+  if (win32_channel->event == WSA_INVALID_EVENT)
-     win32_channel->event = WSACreateEvent ();
-   watch->pollfd.fd = (gintptr) win32_channel->event;
-@@ -2161,7 +2161,54 @@ g_io_channel_win32_make_pollfd (GIOChann
-       break;
-     case G_IO_WIN32_SOCKET:
--      fd->fd = (gintptr) WSACreateEvent ();
-+      if (win32_channel->event == WSA_INVALID_EVENT)
-+      win32_channel->event = WSACreateEvent ();
-+      fd->fd = (gintptr) win32_channel->event;
-+
-+      if (fd->fd == (gintptr) WSA_INVALID_EVENT)
-+      {
-+        gchar *emsg = g_win32_error_message (GetLastError ());
-+        
-+        g_error ("Error creating event: %s", emsg);
-+        g_free (emsg);
-+      }
-+      else
-+      {
-+        int event_mask = 0;
-+
-+        if (condition & G_IO_IN)
-+          event_mask |= (FD_READ | FD_ACCEPT);
-+        if (condition & G_IO_OUT)
-+          event_mask |= (FD_WRITE | FD_CONNECT);
-+        event_mask |= FD_CLOSE;
-+
-+        ResetEvent ((WSAEVENT) fd->fd);
-+
-+        if (win32_channel->debug)
-+          g_print ("WSAEventSelect(%d,%p,{%s})",
-+                   win32_channel->fd, (HANDLE) fd->fd,
-+                   event_mask_to_string (event_mask));
-+        if (WSAEventSelect (win32_channel->fd, (HANDLE) fd->fd,
-+                            event_mask) == SOCKET_ERROR)
-+          if (win32_channel->debug)
-+            {
-+              gchar *emsg = g_win32_error_message (WSAGetLastError ());
-+
-+              g_print (" failed: %s", emsg);
-+              g_free (emsg);
-+            }
-+        if (win32_channel->debug)
-+          g_print ("\n");
-+
-+        if ((event_mask & FD_WRITE) &&
-+            win32_channel->ever_writable &&
-+            !win32_channel->write_would_have_blocked)
-+          {
-+            if (win32_channel->debug)
-+              g_print ("WSASetEvent(%p)\n", (WSAEVENT) fd->fd);
-+            WSASetEvent ((WSAEVENT) fd->fd);
-+          }
-+      }
-       break;
-       
-     case G_IO_WIN32_WINDOWS_MESSAGES:
diff --git a/patches/gpgol-1.1.3/01-w64-ming64.patch b/patches/gpgol-1.1.3/01-w64-ming64.patch
deleted file mode 100755 (executable)
index f8572af..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-Fix an w64-mingw32 incompatibility.
-
-
-diff --git a/src/common.c b/src/common.c
-index 43239c7..68cae2d 100644
---- a/src/common.c
-+++ b/src/common.c
-@@ -18,6 +18,7 @@
-  */
-
- #include <config.h>
-+#define OEMRESOURCE    /* Required for OBM_CHECKBOXES.  */
- #include <windows.h>
- #include <shlobj.h>
- #ifndef CSIDL_APPDATA
-diff --git a/src/ext-commands.cpp b/src/ext-commands.cpp
-index 04140c5..85feb2d 100644
---- a/src/ext-commands.cpp
-+++ b/src/ext-commands.cpp
-@@ -21,7 +21,11 @@
- #include <config.h>
- #endif
-
--#define _WIN32_IE 0x400 /* Need TBIF_COMMAND et al.  */
-+/* Need TBIF_COMMAND et al. (0x0400 would be sufficient but elsewhere
-+   we require 0x600 anyway). */
-+#ifndef _WIN32_IE
-+# define _WIN32_IE 0x0600
-+#endif
- #include <windows.h>
-
- #include "mymapi.h"
diff --git a/patches/gpgol-1.1.3/02-off_t.postcfg-build b/patches/gpgol-1.1.3/02-off_t.postcfg-build
deleted file mode 100755 (executable)
index da91dac..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-#
-# Hack to force 64 bit off_t for gpgol
-#
-set -e
-echo '#define _FILE_OFFSET_BITS 64' >>config.h
diff --git a/patches/gtk+-2.24.17/01-utf-conv-crash.patch b/patches/gtk+-2.24.17/01-utf-conv-crash.patch
deleted file mode 100755 (executable)
index e5c2ce8..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From a14db20143617583a2b9fac87833c583b1dafb44 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
-Date: Wed, 20 Mar 2013 23:12:56 +0100
-Subject: [PATCH] win32: do not crash on invalid utf8 conversion
-
-g_utf8_to_utf16() is not guaranteed to succeed. Check the error
-and return if it failed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696232
----
- gdk/win32/gdkproperty-win32.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
-index 9096729..1e47d4b 100644
---- a/gdk/win32/gdkproperty-win32.c
-+++ b/gdk/win32/gdkproperty-win32.c
-@@ -158,6 +158,7 @@ gdk_property_change (GdkWindow    *window,
-   guchar *ucptr;
-   wchar_t *wcptr, *p;
-   glong wclen;
-+  GError *err = NULL;
-
-   g_return_if_fail (window != NULL);
-   g_return_if_fail (GDK_IS_WINDOW (window));
-@@ -201,7 +202,13 @@ gdk_property_change (GdkWindow    *window,
-             return;
-           }
-
--        wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, NULL);
-+        wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, &err);
-+          if (err != NULL)
-+            {
-+              g_warning ("Failed to convert utf8: %s", err->message);
-+              g_clear_error (&err);
-+              return;
-+            }
-
-         wclen++;              /* Terminating 0 */
-         size = wclen * 2;
---
-1.8.1.1.439.g50a6b54
diff --git a/patches/gtk+-2.24.17/02-crlf.patch b/patches/gtk+-2.24.17/02-crlf.patch
deleted file mode 100755 (executable)
index 2876842..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 8e69418cc5a50542e2e831dfaa815881b5086d98 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@lanedo.com>
-Date: Wed, 27 Feb 2013 09:22:27 +0100
-Subject: [PATCH] win32: don't convert '\n' to '\r\n' when copying if it
- already is '\r\n'
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649390
----
- gdk/win32/gdkproperty-win32.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
-index 7a3671b..b0a97e8 100644
---- a/gdk/win32/gdkproperty-win32.c
-+++ b/gdk/win32/gdkproperty-win32.c
-@@ -198,7 +198,7 @@ _gdk_win32_window_change_property (GdkWindow    *window,
-         wclen++;              /* Terminating 0 */
-         size = wclen * 2;
-         for (i = 0; i < wclen; i++)
--          if (wcptr[i] == '\n')
-+          if (wcptr[i] == '\n' && (i == 0 || wcptr[i - 1] != '\r'))
-             size += 2;
-
-         if (!(hdata = GlobalAlloc (GMEM_MOVEABLE, size)))
-@@ -215,7 +215,7 @@ _gdk_win32_window_change_property (GdkWindow    *window,
-         p = (wchar_t *) ucptr;
-         for (i = 0; i < wclen; i++)
-           {
--            if (wcptr[i] == '\n')
-+            if (wcptr[i] == '\n' && (i == 0 || wcptr[i - 1] != '\r'))
-               *p++ = '\r';
-             *p++ = wcptr[i];
-           }
---
-1.8.1.2
diff --git a/patches/libetpan-0.57/01-gnutls_compat.patch b/patches/libetpan-0.57/01-gnutls_compat.patch
deleted file mode 100755 (executable)
index 372c232..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Fix connection to servers not implementing random padding
-
-Index: src/data-types/mailstream_ssl.c
-===================================================================
-RCS file: /cvsroot/libetpan/libetpan/src/data-types/mailstream_ssl.c,v
-retrieving revision 1.69
-retrieving revision 1.71
-diff -u -p -u -r1.69 -r1.71
---- src/data-types/mailstream_ssl.c    21 Nov 2008 17:29:43 -0000      1.69
-+++ src/data-types/mailstream_ssl.c    12 Jun 2009 07:28:38 -0000      1.71
-@@ -460,7 +460,7 @@ static struct mailstream_ssl_data * ssl_
-   gnutls_cipher_set_priority (session, cipher_prio);
-   gnutls_kx_set_priority (session, kx_prio);
-   gnutls_mac_set_priority (session, mac_prio);
--
-+  gnutls_record_disable_padding(session);
-   gnutls_dh_set_prime_bits(session, 512);
-   gnutls_transport_set_ptr(session, (gnutls_transport_ptr) fd);
diff --git a/patches/libgpg-error-1.12/01-fix-get-string.patch b/patches/libgpg-error-1.12/01-fix-get-string.patch
deleted file mode 100755 (executable)
index 7ec0b5e..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 52e1f2e131b422fdb66abeaf4a8f084689b39bf7 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Mon, 15 Jul 2013 15:31:55 +0200
-Subject: [PATCH] w32: Fix corrupted string output.
-
-* src/w32-gettext.c (get_string): Pass the nul of the utf-8 string to
-the conversion function but keep TRANSLEN without the nul.
---
-
-The bug first occurred on Windows 8 but it is a real thing.  Assuming
-that a malloced buffer is zeroed out is not solid assumptions ;-)
----
- src/w32-gettext.c |   22 ++++++++++++++++++----
- 1 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/src/w32-gettext.c b/src/w32-gettext.c
-index 936cafe..89f505d 100644
---- a/src/w32-gettext.c
-+++ b/src/w32-gettext.c
-@@ -1617,6 +1617,17 @@ get_string (struct loaded_domain *domain, uint32_t idx,
-                 + SWAPIT(domain->must_swap, domain->trans_tab[idx].offset));
-       plen_utf8 = SWAPIT(domain->must_swap, domain->trans_tab[idx].length);
-
-+      /* We need to include the nul, so that the utf8->wchar->native
-+         conversion chain works correctly and the nul is stored after
-+         the conversion. */
-+      if (p_utf8[plen_utf8])
-+        {
-+          trans = "ERROR in MO file"; /* Terminating zero is missing.  */
-+          translen = 0;
-+          goto leave;
-+        }
-+      plen_utf8++;
-+
-       buf = utf8_to_native (p_utf8, plen_utf8, &buflen);
-       if (!buf)
-         {
-@@ -1640,10 +1651,10 @@ get_string (struct loaded_domain *domain, uint32_t idx,
-           /* There is not enough space for the translation (or for
-              whatever reason an empty string is used): Store it in the
-              overflow_space and mark that in the mapped array.
--             Because UTF-8 strings are in general shorter than the
--             Windows 2 byte encodings, we expect that this won't
--             happen too often (if at all) and thus we use a linked
--             list to manage this space. */
-+             Because UTF-8 strings are in general longer than the
-+             Windows native encoding, we expect that this won't happen
-+             too often and thus we use a linked list to manage this
-+             space. */
-           os = jnlib_malloc (sizeof *os + buflen);
-           if (os)
-             {
-@@ -1662,6 +1673,8 @@ get_string (struct loaded_domain *domain, uint32_t idx,
-               translen = 0;
-             }
-         }
-+      if (translen)
-+        translen--;  /* TRANSLEN shall be the size without the nul.  */
-       jnlib_free (buf);
-     }
-   else if (domain->mapped[idx] == 1)
-@@ -1688,6 +1701,7 @@ get_string (struct loaded_domain *domain, uint32_t idx,
-       translen = domain->mapped[idx];
-     }
-
-+ leave:
-   if (use_plural && translen)
-     return get_plural (trans, translen, nplural);
-   else
---
-1.7.7.1
diff --git a/patches/libxml2-2.7.8/01-cve-2012-5134 b/patches/libxml2-2.7.8/01-cve-2012-5134
deleted file mode 100755 (executable)
index 3c7f86c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-This fixes a buffer underflow.
-
-
---- libxml2-2.7.8/parser.c~     2010-11-04 16:55:45.000000000 +0100
-+++ libxml2-2.7.8/parser.c      2012-12-07 10:04:17.865677886 +0100
-@@ -3922,7 +3922,7 @@
-        c = CUR_CHAR(l);
-     }
-     if ((in_space) && (normalize)) {
--        while (buf[len - 1] == 0x20) len--;
-+        while (len > 0 && buf[len - 1] == 0x20) len--;
-     }
-     buf[len] = 0;
-     if (RAW == '<') {