Skip to content

Commit bf24725

Browse files
jolivainyann-morin-1998
authored andcommitted
package/sylpheed: fix patch fuzz
Commit 8f88a64 "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, sylpheed fails to build with output: Applying 0001-harden-link-checker-before-accepting-click.patch using patch: patching file src/textview.c Hunk #1 FAILED at 2885. Hunk #2 FAILED at 2922. 2 out of 2 hunks FAILED -- saving rejects to file src/textview.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Julien Olivain <ju.o@free.fr> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
1 parent 720177d commit bf24725

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
From ac286a71ed78429e16c612161251b9ea90ccd431 Mon Sep 17 00:00:00 2001
1+
From 876c54b2927e48ab6900e5e6b9395742f75e840e Mon Sep 17 00:00:00 2001
22
From: Paul <paul@claws-mail.org>
33
Date: Sun, 23 May 2021 12:16:40 +0100
44
Subject: [PATCH] harden link checker before accepting click
55

66
[Retrieved from:
77
https://git.claws-mail.org/?p=claws.git;a=commit;h=ac286a71ed78429e16c612161251b9ea90ccd431]
88
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
9+
[Julien: rebased patch on version 3.7.0]
10+
Signed-off-by: Julien Olivain <ju.o@free.fr>
911
---
1012
src/textview.c | 4 +++-
1113
1 file changed, 3 insertions(+), 1 deletion(-)
1214

1315
diff --git a/src/textview.c b/src/textview.c
14-
index 62ad46eaf..3cdf5d911 100644
16+
index e55eea9..6fbb8a1 100644
1517
--- a/src/textview.c
1618
+++ b/src/textview.c
17-
@@ -2885,7 +2885,7 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
19+
@@ -2689,7 +2689,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
1820
gboolean retval = TRUE;
1921

2022
if (is_uri_string(uri->uri) == FALSE)
2123
- return TRUE;
2224
+ return FALSE;
2325

24-
visible_str = textview_get_visible_uri(textview, uri);
25-
if (visible_str == NULL)
26-
@@ -2922,6 +2922,8 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
27-
if (aval == G_ALERTALTERNATE)
26+
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
27+
gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);
28+
@@ -2725,6 +2725,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
29+
if (aval == G_ALERTDEFAULT)
2830
retval = TRUE;
2931
}
3032
+ if (strlen(uri->uri) > get_uri_len(uri->uri))
@@ -33,5 +35,5 @@ index 62ad46eaf..3cdf5d911 100644
3335
g_free(visible_str);
3436

3537
--
36-
2.25.1
38+
2.45.2
3739

0 commit comments

Comments
 (0)