diff -Nru irssi-1.4.4/debian/changelog irssi-1.4.4/debian/changelog --- irssi-1.4.4/debian/changelog 2023-06-16 11:57:19.000000000 +0000 +++ irssi-1.4.4/debian/changelog 2023-08-31 19:14:27.000000000 +0000 @@ -1,3 +1,22 @@ +irssi (1.4.4-2ubuntu1) mantic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Re-enabled 20fix_ssl_proxy_hostname_check. + + When we have a proxy setting, we expect the CN to match + the proxy hostname, not the server hostname. + - d/p/03firsttimer_text: + + Adapt 03firsttimer_text so it tells you about + connecting to Libera and joining #ubuntu. + + -- Gianfranco Costamagna Thu, 31 Aug 2023 21:14:27 +0200 + +irssi (1.4.4-2) unstable; urgency=medium + + * d/p/30perl-ntype: + - Grab an upstream commit to fix compatibility with perl 5.38. + + -- Unit 193 Thu, 31 Aug 2023 05:03:00 -0400 + irssi (1.4.4-1ubuntu1) mantic; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru irssi-1.4.4/debian/patches/30perl-ntype irssi-1.4.4/debian/patches/30perl-ntype --- irssi-1.4.4/debian/patches/30perl-ntype 1970-01-01 00:00:00.000000000 +0000 +++ irssi-1.4.4/debian/patches/30perl-ntype 2023-08-31 09:03:00.000000000 +0000 @@ -0,0 +1,66 @@ +From 41cdf31269fc0aafec7b37f6965dcc83e65b9dd4 Mon Sep 17 00:00:00 2001 +From: ailin-nemui +Date: Tue, 18 Jul 2023 22:05:28 +0000 +Subject: [PATCH] Merge pull request #1474 from ailin-nemui/perl5380 + +fix usage of $type in ExtUtils::ParseXS 3.50 + +(cherry picked from commit da49ec62e6cc949d3e5359b88abbd0b038d3e23a) + +Origin: https://codeberg.org/irssi/irssi/releases/download/1.4.4/perl-ntype.patch +--- + src/perl/common/typemap | 2 +- + src/perl/irc/typemap | 2 +- + src/perl/textui/typemap | 2 +- + src/perl/ui/typemap | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/perl/common/typemap b/src/perl/common/typemap +index 5b7e0c32..9b6c6668 100644 +--- a/src/perl/common/typemap ++++ b/src/perl/common/typemap +@@ -28,5 +28,5 @@ T_IrssiObj + $arg = iobject_bless((SERVER_REC *)$var); + + T_PlainObj +- $arg = plain_bless($var, \"$type\"); ++ $arg = plain_bless($var, \"$ntype\"); + +diff --git a/src/perl/irc/typemap b/src/perl/irc/typemap +index 9bf87647..c8a9b678 100644 +--- a/src/perl/irc/typemap ++++ b/src/perl/irc/typemap +@@ -36,5 +36,5 @@ T_DccObj + $arg = simple_iobject_bless((DCC_REC *)$var); + + T_PlainObj +- $arg = plain_bless($var, \"$type\"); ++ $arg = plain_bless($var, \"$ntype\"); + +diff --git a/src/perl/textui/typemap b/src/perl/textui/typemap +index 7710c2d2..e597c586 100644 +--- a/src/perl/textui/typemap ++++ b/src/perl/textui/typemap +@@ -18,7 +18,7 @@ T_BufferLineWrapper + OUTPUT + + T_PlainObj +- $arg = plain_bless($var, \"$type\"); ++ $arg = plain_bless($var, \"$ntype\"); + + T_BufferLineWrapper + $arg = perl_buffer_line_bless($var); +diff --git a/src/perl/ui/typemap b/src/perl/ui/typemap +index 4afb273d..98355191 100644 +--- a/src/perl/ui/typemap ++++ b/src/perl/ui/typemap +@@ -13,5 +13,5 @@ T_PlainObj + OUTPUT + + T_PlainObj +- $arg = plain_bless($var, \"$type\"); ++ $arg = plain_bless($var, \"$ntype\"); + +-- +2.41.0 + diff -Nru irssi-1.4.4/debian/patches/series irssi-1.4.4/debian/patches/series --- irssi-1.4.4/debian/patches/series 2023-06-16 11:57:16.000000000 +0000 +++ irssi-1.4.4/debian/patches/series 2023-08-31 15:47:45.000000000 +0000 @@ -4,3 +4,4 @@ 12manpage-fix 20fix_ssl_proxy_hostname_check 25tls-ssl-compat-defines +30perl-ntype