Update debian/patches for the new Midori version (0.5.11).
This commit is contained in:
parent
bb954d02ba
commit
a84927af41
2 changed files with 11 additions and 29 deletions
8
debian/patches/add-debian-searches
vendored
8
debian/patches/add-debian-searches
vendored
|
@ -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-debian-repo.orig/config/search
|
||||||
+++ midori/data/search 2013-10-23 20:47:57.000000000 -0700
|
+++ midori-debian-repo/config/search
|
||||||
@@ -34,3 +34,16 @@
|
@@ -34,3 +34,16 @@ text=Localize text or URL
|
||||||
uri=http://translate.google.com/?q=
|
uri=http://translate.google.com/?q=
|
||||||
token=gt
|
token=gt
|
||||||
|
|
||||||
|
|
32
debian/patches/force-ssl-cert-verification.patch
vendored
32
debian/patches/force-ssl-cert-verification.patch
vendored
|
@ -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-debian-repo.orig/midori/midori-session.c
|
||||||
+++ midori/midori/midori-session.c 2013-10-23 20:49:48.000000000 -0700
|
+++ midori-debian-repo/midori/midori-session.c
|
||||||
@@ -172,7 +172,7 @@
|
@@ -189,7 +189,7 @@ midori_load_soup_session (gpointer setti
|
||||||
#if defined (HAVE_LIBSOUP_2_37_1)
|
#ifndef G_OS_WIN32
|
||||||
g_object_set (session,
|
g_object_set (session,
|
||||||
"ssl-use-system-ca-file", TRUE,
|
"ssl-use-system-ca-file", TRUE,
|
||||||
- "ssl-strict", FALSE,
|
- "ssl-strict", FALSE,
|
||||||
+ "ssl-strict", TRUE,
|
+ "ssl-strict", TRUE,
|
||||||
NULL);
|
NULL);
|
||||||
#elif defined (HAVE_LIBSOUP_2_29_91)
|
#else /* G_OS_WIN32 */
|
||||||
const gchar* certificate_files[] =
|
/* We cannot use "ssl-use-system-ca-file" on Windows
|
||||||
@@ -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
|
|
||||||
|
|
Loading…
Reference in a new issue