From a84927af41948fd1522ca2a146f8860e89fc7d70 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Fri, 11 Sep 2015 20:49:27 -0400 Subject: [PATCH] Update debian/patches for the new Midori version (0.5.11). --- debian/patches/add-debian-searches | 8 ++--- .../patches/force-ssl-cert-verification.patch | 32 ++++--------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/debian/patches/add-debian-searches b/debian/patches/add-debian-searches index f7b11c56..2a17788d 100644 --- a/debian/patches/add-debian-searches +++ b/debian/patches/add-debian-searches @@ -1,8 +1,8 @@ -Index: midori/data/search +Index: midori-debian-repo/config/search =================================================================== ---- midori.orig/data/search 2013-10-23 20:45:02.000000000 -0700 -+++ midori/data/search 2013-10-23 20:47:57.000000000 -0700 -@@ -34,3 +34,16 @@ +--- midori-debian-repo.orig/config/search ++++ midori-debian-repo/config/search +@@ -34,3 +34,16 @@ text=Localize text or URL uri=http://translate.google.com/?q= token=gt diff --git a/debian/patches/force-ssl-cert-verification.patch b/debian/patches/force-ssl-cert-verification.patch index 74c660a6..09533a1e 100644 --- a/debian/patches/force-ssl-cert-verification.patch +++ b/debian/patches/force-ssl-cert-verification.patch @@ -1,31 +1,13 @@ -Index: midori/midori/midori-session.c +Index: midori-debian-repo/midori/midori-session.c =================================================================== ---- midori.orig/midori/midori-session.c 2013-10-23 20:49:21.000000000 -0700 -+++ midori/midori/midori-session.c 2013-10-23 20:49:48.000000000 -0700 -@@ -172,7 +172,7 @@ - #if defined (HAVE_LIBSOUP_2_37_1) +--- midori-debian-repo.orig/midori/midori-session.c ++++ midori-debian-repo/midori/midori-session.c +@@ -189,7 +189,7 @@ midori_load_soup_session (gpointer setti + #ifndef G_OS_WIN32 g_object_set (session, "ssl-use-system-ca-file", TRUE, - "ssl-strict", FALSE, + "ssl-strict", TRUE, NULL); - #elif defined (HAVE_LIBSOUP_2_29_91) - const gchar* certificate_files[] = -@@ -191,7 +191,7 @@ - { - g_object_set (session, - "ssl-ca-file", certificate_files[i], -- "ssl-strict", FALSE, -+ "ssl-strict", TRUE, - NULL); - break; - } -@@ -206,7 +206,7 @@ - gchar* certificate_file = midori_paths_get_res_filename ("ca-bundle.crt"); - g_object_set (session, - "ssl-ca-file", certificate_file, -- "ssl-strict", FALSE, -+ "ssl-strict", TRUE, - NULL); - g_free (certificate_file); - #endif + #else /* G_OS_WIN32 */ + /* We cannot use "ssl-use-system-ca-file" on Windows