public-inbox: 1.2.0 -> 1.3.0

4 files changed, 33 insertions, 28 deletions

diff --git a/overlays/patches/public-inbox/0003-view-don-t-show-page-if-no-links-follow-it.patch b/overlays/patches/public-inbox/0001-view-don-t-show-page-if-no-links-follow-it.patch
index 811d6149d994..5ece14d2f5b0 100644
--- a/overlays/patches/public-inbox/0003-view-don-t-show-page-if-no-links-follow-it.patch
+++ b/overlays/patches/public-inbox/0001-view-don-t-show-page-if-no-links-follow-it.patch
@@ -1,17 +1,17 @@
-From 054697a5129725f900a84bbdfee356a4f5373376 Mon Sep 17 00:00:00 2001
+From f5ec336b6354a713c48d8934ba0769caf5be6dac Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Thu, 16 Jan 2020 18:08:33 +0000
-Subject: [PATCH 3/5] view: don't show `page:' if no links follow it
+Subject: [PATCH 1/3] view: don't show `page:' if no links follow it
 
 ---
  lib/PublicInbox/View.pm | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
-index 39b04174..aebf7fe9 100644
+index d097d8ab..374733be 100644
 --- a/lib/PublicInbox/View.pm
 +++ b/lib/PublicInbox/View.pm
-@@ -1157,7 +1157,9 @@ sub pagination_footer ($$) {
+@@ -1149,7 +1149,9 @@ sub pagination_footer ($$) {
  		$next = $next ? "$next " : '     ';
  		$prev .= qq! <a\nhref='$latest'>latest</a>!;
  	}
@@ -23,5 +23,5 @@ index 39b04174..aebf7fe9 100644
  
  sub index_nav { # callback for WwwStream
 -- 
-2.26.1
+2.30.0
 
diff --git a/overlays/patches/public-inbox/0004-view-don-t-500-if-no-mail-received-yet.patch b/overlays/patches/public-inbox/0002-view-don-t-500-if-no-mail-received-yet.patch
index eb33468e1992..4514f208fbb7 100644
--- a/overlays/patches/public-inbox/0004-view-don-t-500-if-no-mail-received-yet.patch
+++ b/overlays/patches/public-inbox/0002-view-don-t-500-if-no-mail-received-yet.patch
@@ -1,17 +1,17 @@
-From 2712913f07d83a6a33bbdc55a1edee0a008e5b2e Mon Sep 17 00:00:00 2001
+From e75f974450d7b6a35a5b444a77c133b19490c953 Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Thu, 16 Jan 2020 18:09:12 +0000
-Subject: [PATCH 4/5] view: don't 500 if no mail received yet
+Subject: [PATCH 2/3] view: don't 500 if no mail received yet
 
 ---
  lib/PublicInbox/View.pm | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
-index aebf7fe9..b40108bc 100644
+index 374733be..070a288c 100644
 --- a/lib/PublicInbox/View.pm
 +++ b/lib/PublicInbox/View.pm
-@@ -1083,7 +1083,7 @@ sub acc_topic {
+@@ -1077,7 +1077,7 @@ sub acc_topic { # walk_thread callback
  sub dump_topics {
  	my ($ctx) = @_;
  	my $order = delete $ctx->{order}; # [ ds, subj1, subj2, subj3, ... ]
@@ -21,5 +21,5 @@ index aebf7fe9..b40108bc 100644
  		return 404;
  	}
 -- 
-2.26.1
+2.30.0
 
diff --git a/overlays/patches/public-inbox/0005-wwwstream-make-source-info-configurable.patch b/overlays/patches/public-inbox/0003-wwwstream-make-source-info-configurable.patch
index 605100cd38ae..2d424fcf53c9 100644
--- a/overlays/patches/public-inbox/0005-wwwstream-make-source-info-configurable.patch
+++ b/overlays/patches/public-inbox/0003-wwwstream-make-source-info-configurable.patch
@@ -1,7 +1,7 @@
-From f119d4315be998de65d5a1b56fa643fb9084410b Mon Sep 17 00:00:00 2001
+From c3429a2c3cf743418167ed41e28bfc8e1c19f7e5 Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Fri, 17 Jan 2020 15:21:42 +0000
-Subject: [PATCH 5/5] wwwstream: make source info configurable
+Subject: [PATCH 3/3] wwwstream: make source info configurable
 
 ---
  Documentation/public-inbox-config.pod |  6 ++++++
@@ -10,7 +10,7 @@ Subject: [PATCH 5/5] wwwstream: make source info configurable
  3 files changed, 35 insertions(+), 8 deletions(-)
 
 diff --git a/Documentation/public-inbox-config.pod b/Documentation/public-inbox-config.pod
-index 1c5ba015..5ae23924 100644
+index 53926ef4..4db3e002 100644
 --- a/Documentation/public-inbox-config.pod
 +++ b/Documentation/public-inbox-config.pod
 @@ -186,6 +186,12 @@ and the path may be "/dev/null" or any empty file.
@@ -27,10 +27,10 @@ index 1c5ba015..5ae23924 100644
  
  This may be set to C<none> to disable the use of SpamAssassin
 diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
-index 03534f03..f1a1fd81 100644
+index fa76fbb6..ed59cd43 100644
 --- a/lib/PublicInbox/WwwListing.pm
 +++ b/lib/PublicInbox/WwwListing.pm
-@@ -87,8 +87,8 @@ sub ibx_entry {
+@@ -95,8 +95,8 @@ sub ibx_entry {
  	$tmp;
  }
  
@@ -41,8 +41,8 @@ index 03534f03..f1a1fd81 100644
  	my $title = 'public-inbox';
  	my $out = '';
  	my $code = 404;
-@@ -107,7 +107,8 @@ sub html ($$) {
- 		$out = '<pre>'.$l->linkify_2(ascii_html($tmp)).'</pre><hr>';
+@@ -114,7 +114,8 @@ sub html ($$) {
+ 		$out = '<pre>'.$l->to_html($tmp).'</pre><hr>';
  	}
  	$out = "<html><head><title>$title</title></head><body>" . $out;
 -	$out .= '<pre>'. PublicInbox::WwwStream::code_footer($env) .
@@ -51,7 +51,7 @@ index 03534f03..f1a1fd81 100644
  		'</pre></body></html>';
  
  	my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
-@@ -231,7 +232,7 @@ sub call {
+@@ -239,7 +240,7 @@ sub call {
  		js($env, $list);
  	} else { # /
  		my $list = $self->{www_cb}->($self, $env, 'www');
@@ -61,11 +61,11 @@ index 03534f03..f1a1fd81 100644
  }
  
 diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
-index 0f4f55d0..09473c9f 100644
+index 3a867ec3..08d4ba30 100644
 --- a/lib/PublicInbox/WwwStream.pm
 +++ b/lib/PublicInbox/WwwStream.pm
-@@ -76,10 +76,30 @@ sub _html_top ($) {
- 		"</head><body>". $top . $tip;
+@@ -71,10 +71,30 @@ sub _html_top ($) {
+ 		'</head><body>'. $top . (delete($ctx->{-html_tip}) // '');
  }
  
 -sub code_footer ($) {
@@ -88,7 +88,7 @@ index 0f4f55d0..09473c9f 100644
 +sub code_footer {
 +	my ($pi_config, $env) = @_;
 +
- 	my $u = PublicInbox::Hval::prurl($env, $CODE_URL);
+ 	my $u = prurl($env, $CODE_URL);
 -	qq(AGPL code for this site: git clone <a\nhref="$u">$u</a>)
 +	my $default_info = qq(git clone <a\n href="$u">$u</a>);
 +
@@ -98,7 +98,7 @@ index 0f4f55d0..09473c9f 100644
  }
  
  sub _html_end {
-@@ -153,7 +173,7 @@ EOF
+@@ -146,7 +166,7 @@ EOF
  	'<hr><pre>'.join("\n\n",
  		$desc,
  		$urls,
@@ -108,5 +108,5 @@ index 0f4f55d0..09473c9f 100644
  }
  
 -- 
-2.26.1
+2.30.0
 
diff --git a/overlays/patches/public-inbox/default.nix b/overlays/patches/public-inbox/default.nix
index f9f573787c1c..26f21c6da11b 100644
--- a/overlays/patches/public-inbox/default.nix
+++ b/overlays/patches/public-inbox/default.nix
@@ -1,9 +1,14 @@
-{ public-inbox }:
+{ public-inbox, fetchpatch }:
 
 public-inbox.overrideAttrs ({ patches ? [], ... }: {
   patches = patches ++ [
-    ./0003-view-don-t-show-page-if-no-links-follow-it.patch
-    ./0004-view-don-t-500-if-no-mail-received-yet.patch
-    ./0005-wwwstream-make-source-info-configurable.patch
+    (fetchpatch {
+      url = "https://80x24.org/public-inbox.git/patch/?id=41ecd08ee60daa495de3a2fc2c0296dc9cc9a0b3";
+      sha256 = "1skn2ncr9g6k78fiscwkqisg4k0pv133sf4pyzryn3ahb09i1yqn";
+    })
+
+    ./0001-view-don-t-show-page-if-no-links-follow-it.patch
+    ./0002-view-don-t-500-if-no-mail-received-yet.patch
+    ./0003-wwwstream-make-source-info-configurable.patch
   ];
 })