Adding debian version 1.4.5-1.debian/1.4.5-1debian

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 157 insertions, 0 deletions

diff --git a/debian/patches/01chanmode_expando_strip b/debian/patches/01chanmode_expando_strip
new file mode 100644
index 0000000..c64e7c4
--- /dev/null
+++ b/debian/patches/01chanmode_expando_strip
@@ -0,0 +1,21 @@
+Author: Rhonda D'Vine <rhonda@debian.org>	vim:ft=diff:
+Description: Don't expand chanmode by default, BTS #347944
+Forwarded: not-needed
+
+---
+ src/core/expandos.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/src/core/expandos.c	2022-02-26 23:11:26.700266885 -0500
++++ b/src/core/expandos.c	2022-02-26 23:11:26.696266861 -0500
+@@ -611,7 +611,9 @@
+ 	settings_add_str("misc", "STATUS_OPER", "*");
+ 	settings_add_str("lookandfeel", "timestamp_format", "%H:%M");
+ 	settings_add_str("lookandfeel", "timestamp_format_alt", "%a %e %b %H:%M");
+-	settings_add_bool("lookandfeel", "chanmode_expando_strip", FALSE);
++	/* don't expand by default and expose channel key,
++	 * see debian bug #347944 */
++	settings_add_bool("lookandfeel", "chanmode_expando_strip", TRUE);
+ 
+ 	last_sent_msg = NULL; last_sent_msg_body = NULL;
+ 	last_privmsg_from = NULL; last_public_from = NULL;
diff --git a/debian/patches/02ctcp_version_reply b/debian/patches/02ctcp_version_reply
new file mode 100644
index 0000000..17fca25
--- /dev/null
+++ b/debian/patches/02ctcp_version_reply
@@ -0,0 +1,20 @@
+Author: Rhonda D'Vine <rhonda@debian.org>	vim:ft=diff:
+Description: remove $sysname $sysarch from default version reply, BTS #373094
+Forwarded: not-needed
+
+Index: irssi-0.8.15~rc1/src/irc/core/ctcp.c
+===================================================================
+--- irssi-0.8.15~rc1.orig/src/irc/core/ctcp.c
++++ irssi-0.8.15~rc1/src/irc/core/ctcp.c
+@@ -327,8 +327,10 @@ void ctcp_init(void)
+ {
+ 	ctcp_cmds = NULL;
+ 
++	/* remove $sysname $sysarch from default version reply, too much info,
++	 * see debian bug #373094 */
+ 	settings_add_str("misc", "ctcp_version_reply",
+-			 PACKAGE_TARNAME" v$J - running on $sysname $sysarch");
++			 PACKAGE_TARNAME" v$J");
+ 	settings_add_str("misc", "ctcp_userinfo_reply", "$Y");
+ 	settings_add_int("flood", "max_ctcp_queue", 5);
+ 
diff --git a/debian/patches/03firsttimer_text b/debian/patches/03firsttimer_text
new file mode 100644
index 0000000..96d545e
--- /dev/null
+++ b/debian/patches/03firsttimer_text
@@ -0,0 +1,31 @@
+Author: Rhonda D'Vine <rhonda@debian.org>	vim:ft=diff:
+Description: add hint about #debian to first time user message, BTS #393707
+Forwarded: not-needed
+
+---
+ src/fe-text/module-formats.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/src/fe-text/module-formats.c	2022-06-11 16:45:05.150539089 -0400
++++ b/src/fe-text/module-formats.c	2022-06-11 16:45:05.146539101 -0400
+@@ -90,6 +90,9 @@
+ 	  " | || '_(_-<_-< |%:"
+ 	  "|___|_| /__/__/_|%:"
+ 	  "Irssi v$J - https://irssi.org", 0 },
++
++	/* add debian informations for first time users,
++	 * see debian bug #393707 */
+ 	{ "welcome_firsttime",
+ 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
+ 	  "Hi there! If this is your first time using Irssi, you%:"
+@@ -99,6 +102,10 @@
+ 	  "to answer any questions you may have.%:%:"
+ 	  "Use the /HELP command to get detailed information about%:"
+ 	  "the available commands.%:"
++	  "%:"
++	  "For Debian specific help type \"/connect OFTC\" and%:"
++	  "\"/join #debian\" (without the quotes) and ask your%:"
++	  "question.%:"
+ 	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -", 0 },
+ 	{ "welcome_init_settings", "The following settings were initialized", 0 },
+ 
diff --git a/debian/patches/12manpage-fix b/debian/patches/12manpage-fix
new file mode 100644
index 0000000..cf660df
--- /dev/null
+++ b/debian/patches/12manpage-fix
@@ -0,0 +1,18 @@
+Author: Rhonda D'Vine <rhonda@debian.org>	vim:ft=diff:
+Description: Fix the hyphens in the synopsis
+
+Index: irssi-0.8.18~beta1/docs/irssi.1
+===================================================================
+--- irssi-0.8.18~beta1.orig/docs/irssi.1	2015-12-22 13:50:36.430403104 +0100
++++ irssi-0.8.18~beta1/docs/irssi.1	2015-12-22 13:51:18.934613871 +0100
+@@ -3,8 +3,8 @@
+ Irssi \- a modular IRC client for UNIX
+ .SH SYNOPSIS
+ .B irssi
+-[--config=PATH] [--home=PATH] [-dv!?] [-c server] [-p port] [-n nickname]
+-[-w password] [-h hostname]
++[\-\-config=PATH] [\-\-home=PATH] [\-dv!?] [\-c server] [\-p port] [\-n nickname]
++[\-w password] [\-h hostname]
+ .SH DESCRIPTION
+ .B Irssi
+ is a modular Internet Relay Chat client; it is highly extensible and
diff --git a/debian/patches/20fix_ssl_proxy_hostname_check b/debian/patches/20fix_ssl_proxy_hostname_check
new file mode 100644
index 0000000..65da3ac
--- /dev/null
+++ b/debian/patches/20fix_ssl_proxy_hostname_check
@@ -0,0 +1,16 @@
+Description: fix SSL CN check for proxy setup
+Origin: Ubuntu, https://bugs.launchpad.net/ubuntu/+source/irssi/+bug/565182
+Author: Steve Langasek
+
+--- a/src/core/network-openssl.c
++++ b/src/core/network-openssl.c
+@@ -236,6 +236,9 @@
+ {
+ 	long result;
+ 
++	if (server->connrec->proxy != NULL)
++		hostname = server->connrec->proxy;
++
+ 	result = SSL_get_verify_result(ssl);
+ 	if (result != X509_V_OK) {
+ 		g_warning("Could not verify TLS servers certificate: %s", X509_verify_cert_error_string(result));
diff --git a/debian/patches/25tls-ssl-compat-defines b/debian/patches/25tls-ssl-compat-defines
new file mode 100644
index 0000000..5172467
--- /dev/null
+++ b/debian/patches/25tls-ssl-compat-defines
@@ -0,0 +1,44 @@
+Author: dx	vim:ft=diff:
+Description: backwards compatible ssl/tls rename defines
+
+---
+ src/core/server-connect-rec.h |   12 ++++++++++++
+ src/core/server-setup-rec.h   |   12 ++++++++++++
+ 2 files changed, 24 insertions(+)
+
+--- a/src/core/server-connect-rec.h	2022-06-28 22:14:27.113612025 -0400
++++ b/src/core/server-connect-rec.h	2022-06-28 22:14:27.109612039 -0400
+@@ -47,3 +47,15 @@
+ unsigned short last_failed_family; /* #641: if we failed to connect to ipv6, try ipv4 and vice versa */
+ char *channels;
+ char *away_reason;
++
++#ifndef __SSL_TLS_RENAME_COMPAT
++#define __SSL_TLS_RENAME_COMPAT
++#define use_ssl use_tls
++#define ssl_verify tls_verify
++#define ssl_cert tls_cert
++#define ssl_pkey tls_pkey
++#define ssl_pass tls_pass
++#define ssl_cafile tls_cafile
++#define ssl_capath tls_capath
++#define ssl_ciphers tls_ciphers
++#endif
+--- a/src/core/server-setup-rec.h	2022-06-28 22:14:27.113612025 -0400
++++ b/src/core/server-setup-rec.h	2022-06-28 22:14:27.109612039 -0400
+@@ -34,3 +34,15 @@
+ unsigned int tls_verify:1;
+ 
+ GHashTable *module_data;
++
++#ifndef __SSL_TLS_RENAME_COMPAT
++#define __SSL_TLS_RENAME_COMPAT
++#define use_ssl use_tls
++#define ssl_verify tls_verify
++#define ssl_cert tls_cert
++#define ssl_pkey tls_pkey
++#define ssl_pass tls_pass
++#define ssl_cafile tls_cafile
++#define ssl_capath tls_capath
++#define ssl_ciphers tls_ciphers
++#endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..49c3cdb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+01chanmode_expando_strip
+02ctcp_version_reply
+03firsttimer_text
+12manpage-fix
+## disabled for now, Ubuntu-only patch.
+#20fix_ssl_proxy_hostname_check
+25tls-ssl-compat-defines