All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/sylpheed: fix patch fuzz
@ 2024-07-01 18:09 Julien Olivain
  2024-07-01 20:50 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: Julien Olivain @ 2024-07-01 18:09 UTC (permalink / raw)
  To: buildroot; +Cc: Julien Olivain

Commit 8f88a644ed "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>
---
 ...n-link-checker-before-accepting-click.patch | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
index fe3375bc91b..46b45058372 100644
--- a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
+++ b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
@@ -1,4 +1,4 @@
-From ac286a71ed78429e16c612161251b9ea90ccd431 Mon Sep 17 00:00:00 2001
+From 876c54b2927e48ab6900e5e6b9395742f75e840e Mon Sep 17 00:00:00 2001
 From: Paul <paul@claws-mail.org>
 Date: Sun, 23 May 2021 12:16:40 +0100
 Subject: [PATCH] harden link checker before accepting click
@@ -6,25 +6,27 @@ Subject: [PATCH] harden link checker before accepting click
 [Retrieved from:
 https://git.claws-mail.org/?p=claws.git;a=commit;h=ac286a71ed78429e16c612161251b9ea90ccd431]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Julien: rebased patch on version 3.7.0]
+Signed-off-by: Julien Olivain <ju.o@free.fr>
 ---
  src/textview.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/textview.c b/src/textview.c
-index 62ad46eaf..3cdf5d911 100644
+index e55eea9..6fbb8a1 100644
 --- a/src/textview.c
 +++ b/src/textview.c
-@@ -2885,7 +2885,7 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
+@@ -2689,7 +2689,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
  	gboolean retval = TRUE;
  
  	if (is_uri_string(uri->uri) == FALSE)
 -		return TRUE;
 +		return FALSE;
  
- 	visible_str = textview_get_visible_uri(textview, uri);
- 	if (visible_str == NULL)
-@@ -2922,6 +2922,8 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
- 		if (aval == G_ALERTALTERNATE)
+ 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+ 	gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);
+@@ -2725,6 +2725,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
+ 		if (aval == G_ALERTDEFAULT)
  			retval = TRUE;
  	}
 +	if (strlen(uri->uri) > get_uri_len(uri->uri))
@@ -33,5 +35,5 @@ index 62ad46eaf..3cdf5d911 100644
  	g_free(visible_str);
  
 -- 
-2.25.1
+2.45.2
 
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/sylpheed: fix patch fuzz
  2024-07-01 18:09 [Buildroot] [PATCH 1/1] package/sylpheed: fix patch fuzz Julien Olivain
@ 2024-07-01 20:50 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2024-07-01 20:50 UTC (permalink / raw)
  To: Julien Olivain; +Cc: buildroot

Julien, All,

On 2024-07-01 20:09 +0200, Julien Olivain spake thusly:
> Commit 8f88a644ed "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>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...n-link-checker-before-accepting-click.patch | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
> index fe3375bc91b..46b45058372 100644
> --- a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
> +++ b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
> @@ -1,4 +1,4 @@
> -From ac286a71ed78429e16c612161251b9ea90ccd431 Mon Sep 17 00:00:00 2001
> +From 876c54b2927e48ab6900e5e6b9395742f75e840e Mon Sep 17 00:00:00 2001
>  From: Paul <paul@claws-mail.org>
>  Date: Sun, 23 May 2021 12:16:40 +0100
>  Subject: [PATCH] harden link checker before accepting click
> @@ -6,25 +6,27 @@ Subject: [PATCH] harden link checker before accepting click
>  [Retrieved from:
>  https://git.claws-mail.org/?p=claws.git;a=commit;h=ac286a71ed78429e16c612161251b9ea90ccd431]
>  Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Julien: rebased patch on version 3.7.0]
> +Signed-off-by: Julien Olivain <ju.o@free.fr>
>  ---
>   src/textview.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>  
>  diff --git a/src/textview.c b/src/textview.c
> -index 62ad46eaf..3cdf5d911 100644
> +index e55eea9..6fbb8a1 100644
>  --- a/src/textview.c
>  +++ b/src/textview.c
> -@@ -2885,7 +2885,7 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
> +@@ -2689,7 +2689,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
>   	gboolean retval = TRUE;
>   
>   	if (is_uri_string(uri->uri) == FALSE)
>  -		return TRUE;
>  +		return FALSE;
>   
> - 	visible_str = textview_get_visible_uri(textview, uri);
> - 	if (visible_str == NULL)
> -@@ -2922,6 +2922,8 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
> - 		if (aval == G_ALERTALTERNATE)
> + 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
> + 	gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);
> +@@ -2725,6 +2725,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
> + 		if (aval == G_ALERTDEFAULT)
>   			retval = TRUE;
>   	}
>  +	if (strlen(uri->uri) > get_uri_len(uri->uri))
> @@ -33,5 +35,5 @@ index 62ad46eaf..3cdf5d911 100644
>   	g_free(visible_str);
>   
>  -- 
> -2.25.1
> +2.45.2
>  
> -- 
> 2.45.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-01 20:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-01 18:09 [Buildroot] [PATCH 1/1] package/sylpheed: fix patch fuzz Julien Olivain
2024-07-01 20:50 ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.