Merge ~dbungert/ubuntu/+source/irssi:merge-lp1915558-hirsute into ubuntu/+source/irssi:debian/sid

[Dan Bungert]

[Julian Andres Klode (juliank)]

Looks good to me.

review: Approve

[Julian Andres Klode (juliank)]

FWIW, I actually did grab-merge irssi, resolved the conflicts, build .dsc out of that and the git tree and then did a debdiff, and the only difference was changelog.

[Steve Langasek (vorlon)]

review: Abstain

[Julian Andres Klode (juliank)]

Uploaded

Unmerged commits

722f7af... by Dan Bungert on 2021-02-12

update-maintainer

a2a6ee1... by Dan Bungert on 2021-02-12

reconstruct-changelog

f6c629f... by Dan Bungert on 2021-02-12

merge-changelogs

62c0c6d... by Julian Andres Klode on 2021-02-12

Adapt d/p/03firsttimer_text for Ubuntu

Adapt 03firsttimer_text so it tells you about connecting to freenode and
joining #ubuntu.

b177e7b... by Julian Andres Klode on 2021-02-12

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.

diff --git a/debian/changelog b/debian/changelog
index 2b72506..173db58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+irssi (1.2.2-2ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable (LP: #1915558). 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 freenode and joining #ubuntu.
+
+ -- Dan Bungert <[e-mail]>  Fri, 12 Feb 2021 15:51:38 -0700
+
 irssi (1.2.2-2) unstable; urgency=medium
 
   [ Debian Janitor ]
@@ -15,6 +27,32 @@ irssi (1.2.2-2) unstable; urgency=medium
 
  -- Rhonda D'Vine <[e-mail]>  Wed, 20 Jan 2021 09:19:06 +0100
 
+irssi (1.2.2-1ubuntu3) hirsute; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <[e-mail]>  Mon, 09 Nov 2020 10:51:16 +0100
+
+irssi (1.2.2-1ubuntu2) groovy; urgency=medium
+
+  * debian/patches/1183.patch: [PATCH] manually handle NUL unicode in
+    g_utf8_get_next_char_validated.  Thanks to ailin-nemui <ailin-
+    [e-mail]>.  Closes LP: #1882401.
+
+ -- Steve Langasek <[e-mail]>  Thu, 06 Aug 2020 15:56:50 -0700
+
+irssi (1.2.2-1ubuntu1) focal; 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 freenode and joining #ubuntu.
+
+ -- Julian Andres Klode <[e-mail]>  Tue, 28 Jan 2020 12:26:29 +0100
+
 irssi (1.2.2-1) unstable; urgency=high
 
   * New upstream bugfix release:
@@ -25,6 +63,35 @@ irssi (1.2.2-1) unstable; urgency=high
 
  -- Rhonda D'Vine <[e-mail]>  Thu, 12 Sep 2019 16:11:43 +0200
 
+irssi (1.2.1-1ubuntu3) focal; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <[e-mail]>  Fri, 18 Oct 2019 19:28:07 +0000
+
+irssi (1.2.1-1ubuntu2) eoan; urgency=medium
+
+  * SECURITY UPDATE: Use after free
+    - debian/patches/CVE-2019-15717.patch: fix use after free receiving caps
+      in src/irc/core/irc-cap.c.
+    - CVE-2019-15717
+
+ -- Leonidas S. Barbosa <[e-mail]>  Mon, 02 Sep 2019 16:49:49 -0300
+
+irssi (1.2.1-1ubuntu1) devel; urgency=medium
+
+  * Merge from Debian. 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 freenode and joining #ubuntu.
+  * Changes no longer needed:
+    - d/p/CVE-2019-13045.patch: Drop upstream patch.
+
+ -- Unit 193 <[e-mail]>  Mon, 08 Jul 2019 17:21:57 -0400
+
 irssi (1.2.1-1) unstable; urgency=high
 
   * New upstream bugfix release (closes: #931264)
@@ -33,6 +100,29 @@ irssi (1.2.1-1) unstable; urgency=high
 
  -- Rhonda D'Vine <[e-mail]>  Fri, 28 Jun 2019 14:10:16 +0200
 
+irssi (1.2.0-2ubuntu2) eoan; urgency=medium
+
+  * SECURITY UPDATE: User after free
+    - debian/patches/CVE-2019-13045.patch: copy sasl username
+      and password values in  src/irc/core/irc-core.c,
+      src/irc/core/irc-servers-reconnect.c,
+      src/irc/core/irc-servers-setup.c.
+    - CVE-2019-13045
+
+ -- Leonidas S. Barbosa <[e-mail]>  Tue, 02 Jul 2019 11:14:44 -0300
+
+irssi (1.2.0-2ubuntu1) devel; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Refresh and 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 freenode and joining #ubuntu.
+
+ -- Unit 193 <[e-mail]>  Wed, 13 Feb 2019 15:57:42 -0500
+
 irssi (1.2.0-2) unstable; urgency=medium
 
   [ Rhonda D'Vine ]
@@ -58,6 +148,18 @@ irssi (1.2.0-1) unstable; urgency=medium
 
  -- Rhonda D'Vine <[e-mail]>  Tue, 12 Feb 2019 09:33:05 +0100
 
+irssi (1.1.2-1ubuntu1) devel; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Refresh and 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 freenode and joining #ubuntu.
+
+ -- Unit 193 <[e-mail]>  Sat, 12 Jan 2019 05:09:57 -0500
+
 irssi (1.1.2-1) unstable; urgency=high
 
   [ Daniel Kahn Gillmor ]
@@ -69,6 +171,28 @@ irssi (1.1.2-1) unstable; urgency=high
 
  -- Rhonda D'Vine <[e-mail]>  Fri, 21 Sep 2018 16:57:51 +0200
 
+irssi (1.1.1-1ubuntu2) disco; urgency=medium
+
+  * No-change rebuild for the perl 5.28 transition.
+
+ -- Adam Conrad <[e-mail]>  Fri, 02 Nov 2018 18:08:41 -0600
+
+irssi (1.1.1-1ubuntu1) devel; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Refresh and 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 freenode and joining #ubuntu.
+  * Changes no longer needed:
+    - d/p/90irc-ubuntu-com:
+      + irc.ubuntu.com was a CNAME to irc.freenode.net, but this prevents us
+        from recommending and verifying TLS connections.  (LP: #1456778)
+
+ -- Unit 193 <[e-mail]>  Fri, 27 Jul 2018 07:01:51 -0400
+
 irssi (1.1.1-1) unstable; urgency=medium
 
   [ Rhonda D'Vine ]
@@ -86,6 +210,23 @@ irssi (1.1.1-1) unstable; urgency=medium
 
  -- Rhonda D'Vine <[e-mail]>  Wed, 25 Jul 2018 10:09:40 +0800
 
+irssi (1.0.7-1ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian (LP: #1754781). Remaining changes:
+    - Refresh and 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/90irc-ubuntu-com:
+      + Add the Ubuntu network with irc.ubuntu.com as the server,
+        which is currently a CNAME for chat.freenode.net.
+    - d/p/03firsttimer_text:
+      + Adapt 03firsttimer_text so it tells you about
+        connecting to Ubuntu and joining #ubuntu.
+  * Changes no longer needed:
+    - d/p/CVE-2018-xxxx.patch: Applied upstream.
+
+ -- Unit 193 <[e-mail]>  Fri, 09 Mar 2018 17:54:53 -0500
+
 irssi (1.0.7-1) unstable; urgency=high
 
   * New upstream bugfix release (closes: #886475):
@@ -128,6 +269,73 @@ irssi (1.0.7-1) unstable; urgency=high
 
  -- Rhonda D'Vine <[e-mail]>  Tue, 06 Mar 2018 14:42:44 +0100
 
+irssi (1.0.5-1ubuntu4) bionic; urgency=medium
+
+  * SECURITY UPDATE: Null pointer dereference
+    - debian/patches/CVE-2018-7050.patch: check if
+      nick is Null in src/fe-common/core/chat-completion.c.
+    - CVE-2018-7050
+  * SECURITY UPDATE: Certain nick names result in out-of-bounds
+    access
+    - debian/patches/CVE-2018-7051.patch: don't read beyond end of
+      escaped string in src/fe-common/core/themes.c.
+    - CVE-2018-7051
+  * SECURITY UPDATE: Null pointer dereference
+    - debian/patches/CVE-2018-7052.patch: check if window parent
+      is Null in src/fe-text/mainwindows.c.
+    - CVE-2018-7052
+  * SECURITY UPDATE: use-after-free
+    - debian/patches/CVE-2018-7053.patch: avoiding
+      reuse sasl timeout in src/irc/core/sasl.c.
+    - CVE-2018-7073
+
+ -- Leonidas S. Barbosa <[e-mail]>  Tue, 06 Mar 2018 11:03:13 -0300
+
+irssi (1.0.5-1ubuntu3) bionic; urgency=high
+
+  * No change rebuild against openssl1.1.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 05 Feb 2018 16:50:07 +0000
+
+irssi (1.0.5-1ubuntu2) bionic; urgency=medium
+
+  * SECURITY UPDATE: buffer overread via incomplete escape codes
+    - debian/patches/CVE-2018-5205.patch: check for complete char in
+      src/core/misc.c.
+    - CVE-2018-5205
+  * SECURITY UPDATE: NULL dereference via setting channel topic without
+    specifying a sender
+    - debian/patches/CVE-2018-5206.patch: do not record topic change time
+      when sender is blank in src/irc/core/channel-events.c.
+    - CVE-2018-5206
+  * SECURITY UPDATE: buffer overread via incomplete variable argument
+    - debian/patches/CVE-2018-5207.patch: disable variable arguments code
+      in src/core/special-vars.c.
+    - CVE-2018-5207
+  * SECURITY UPDATE: heap overflow in completion code
+    - debian/patches/CVE-2018-5208.patch: check for direct match of
+      separator in src/fe-common/core/completion.c.
+    - CVE-2018-5208
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 08 Jan 2018 14:30:45 -0500
+
+irssi (1.0.5-1ubuntu1) devel; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Refresh and 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/90irc-ubuntu-com:
+      + Add the Ubuntu network with irc.ubuntu.com as the server,
+        which is currently a CNAME for chat.freenode.net.
+    - d/p/03firsttimer_text:
+      + Adapt 03firsttimer_text so it tells you about
+        connecting to Ubuntu and joining #ubuntu.
+  * Changes no longer needed:
+    - d/p/CVE-2017-15xxx.patch: Applied upstream.
+
+ -- Unit 193 <[e-mail]>  Sat, 02 Dec 2017 17:18:54 -0500
+
 irssi (1.0.5-1) unstable; urgency=high
 
   * New upstream bugfix release (closes: #879521):
@@ -154,6 +362,49 @@ irssi (1.0.5-1) unstable; urgency=high
 
  -- Rhonda D'Vine <[e-mail]>  Mon, 06 Nov 2017 16:24:38 +0100
 
+irssi (1.0.4-1ubuntu4) bionic; urgency=medium
+
+  * No-change rebuild against perlapi-5.26.1
+
+ -- Steve Langasek <[e-mail]>  Thu, 02 Nov 2017 05:36:03 +0000
+
+irssi (1.0.4-1ubuntu3) bionic; urgency=medium
+
+  * SECURITY UPDATE: multiple security issues
+    - debian/patches/CVE-2017-15xxx.patch: address security issues in
+      src/core/recode.c, src/fe-common/core/themes.c,
+      src/irc/core/channel-events.c, src/irc/core/channels-query.c,
+      src/irc/core/irc-servers.c, src/irc/dcc/dcc-chat.c,
+      src/irc/dcc/dcc-get.c, src/irc/dcc/dcc-send.c.
+    - CVE-2017-15227
+    - CVE-2017-15228
+    - CVE-2017-15721
+    - CVE-2017-15722
+    - CVE-2017-15723
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 30 Oct 2017 09:38:11 -0400
+
+irssi (1.0.4-1ubuntu2) artful; urgency=medium
+
+  * No-change rebuild for perl 5.26.0.
+
+ -- Matthias Klose <[e-mail]>  Wed, 26 Jul 2017 20:03:17 +0000
+
+irssi (1.0.4-1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Refresh and 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/90irc-ubuntu-com:
+      + Add the Ubuntu network with irc.ubuntu.com as the server,
+        which is currently a CNAME for chat.freenode.net.
+    - d/p/03firsttimer_text:
+      + Adapt 03firsttimer_text so it tells you about
+        connecting to Ubuntu and joining #ubuntu.
+
+ -- Unit 193 <[e-mail]>  Wed, 12 Jul 2017 04:20:11 -0400
+
 irssi (1.0.4-1) unstable; urgency=high
 
   * New upstream bugfix release (closes: #867598):
@@ -170,12 +421,49 @@ irssi (1.0.4-1) unstable; urgency=high
 
  -- Rhonda D'Vine <[e-mail]>  Tue, 11 Jul 2017 07:17:19 +0200
 
+irssi (1.0.3-1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Refresh and 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/90irc-ubuntu-com:
+      + Add the Ubuntu network with irc.ubuntu.com as the server,
+        which is currently a CNAME for chat.freenode.net.
+    - d/p/03firsttimer_text:
+      + Adapt 03firsttimer_text so it tells you about
+        connecting to Ubuntu and joining #ubuntu.
+
+ -- Unit 193 <[e-mail]>  Thu, 08 Jun 2017 16:52:36 -0400
+
 irssi (1.0.3-1) unstable; urgency=high
 
   * New upstream pure bugfix release.
 
  -- Rhonda D'Vine <[e-mail]>  Thu, 08 Jun 2017 10:08:46 +0200
 
+irssi (1.0.2-1ubuntu2) artful; urgency=medium
+
+  * debian/patches/90-irc-ubuntu-com: update to use the right use_tls
+    option, and add tls_verify. Thanks to Unit193 for noticing!
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 05 May 2017 07:32:23 -0400
+
+irssi (1.0.2-1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian. 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/90irc-ubuntu-com:
+      + Add the Ubuntu network with irc.ubuntu.com as the server,
+        which is currently a CNAME for chat.freenode.net.
+    - d/p/03firsttimer_text:
+      + Adapt 03firsttimer_text so it tells you about
+        connecting to Ubuntu and joining #ubuntu.
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 04 May 2017 07:59:52 -0400
+
 irssi (1.0.2-1) unstable; urgency=high
 
   * New upstream pure bugfix release:
@@ -224,6 +512,34 @@ irssi (0.8.21-1) unstable; urgency=medium
 
  -- Rhonda D'Vine <[e-mail]>  Thu, 05 Jan 2017 10:26:08 +0100
 
+irssi (0.8.20-2ubuntu2) zesty; urgency=medium
+
+  * SECURITY UPDATE: multiple security issues
+    - debian/patches/CVE-2017-5xxx.patch: properly handle strings in
+      src/fe-common/core/formats.c, handle utf8 errors in
+      src/fe-text/term-terminfo.c, properly handle invalid nicks in
+      src/irc/core/irc-nicklist.c, make sure nick is valid in
+      src/irc/core/irc-queries.c.
+    - CVE-2017-5193
+    - CVE-2017-5194
+    - CVE-2017-5195
+    - CVE-2017-5196
+    - CVE-2017-5356
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 25 Jan 2017 12:52:09 -0500
+
+irssi (0.8.20-2ubuntu1) zesty; urgency=low
+
+  * Merge from Debian.  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/90irc-ubuntu-com:
+      + Add the Ubuntu network with irc.ubuntu.com as the server,
+        which is currently a CNAME for chat.freenode.net.
+
+ -- Iain Lane <[e-mail]>  Wed, 07 Dec 2016 16:26:11 +0000
+
 irssi (0.8.20-2) unstable; urgency=high
 
   * New patch 23fix-buf.pl to fix an information exposure issue involved with
@@ -248,6 +564,37 @@ irssi (0.8.19-2) unstable; urgency=low
 
  -- Rhonda D'Vine <[e-mail]>  Wed, 20 Apr 2016 10:32:45 +0200
 
+irssi (0.8.19-1ubuntu3) zesty; urgency=medium
+
+  * No-change rebuild for perl 5.24 transition
+
+ -- Iain Lane <[e-mail]>  Mon, 24 Oct 2016 10:09:47 +0100
+
+irssi (0.8.19-1ubuntu2) yakkety; urgency=medium
+
+  * SECURITY UPDATE: Fix color format decoding (LP: #1624068):
+    - Add debian/patches/91fix-color-formatting:
+      + fix unformat_24bit_color (CVE-2016-7044)
+      + fix format_send_to_gui (CVE-2016-7045)
+
+ -- Kees Cook <[e-mail]>  Thu, 15 Sep 2016 11:43:53 -0700
+
+irssi (0.8.19-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian.  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/90irc-ubuntu-com:
+      + Add the Ubuntu network with irc.ubuntu.com as the server,
+        which is currently a CNAME for chat.freenode.net.
+    - d/p/03firsttimer_text:
+      + Adapt 03firsttimer_text so it tells you about
+        connecting to Ubuntu and joining #ubuntu.
+    - d/control, d/rules: Drop libval-dev, not in Ubuntu main.
+
+ -- Unit 193 <[e-mail]>  Thu, 24 Mar 2016 19:28:09 -0400
+
 irssi (0.8.19-1) unstable; urgency=medium
 
   * New upstream release.
@@ -261,6 +608,22 @@ irssi (0.8.19-1) unstable; urgency=medium
 
  -- Rhonda D'Vine <[e-mail]>  Thu, 24 Mar 2016 15:43:12 +0100
 
+irssi (0.8.18-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian testing (LP: #1423499).  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/90irc-ubuntu-com:
+      + Add the Ubuntu network with irc.ubuntu.com as the server,
+        which is currently a CNAME for chat.freenode.net.
+    - d/p/03firsttimer_text:
+      + Adapt 03firsttimer_text so it tells you about
+        connecting to Ubuntu and joining #ubuntu.
+    - d/control, d/rules: Drop libval-dev, not in Ubuntu main.
+
+ -- Unit 193 <[e-mail]>  Fri, 04 Mar 2016 00:46:08 -0500
+
 irssi (0.8.18-1) unstable; urgency=medium
 
   * New upstream release.
@@ -288,6 +651,22 @@ irssi (0.8.18~beta1-1) experimental; urgency=medium
 
  -- Rhonda D'Vine <[e-mail]>  Tue, 22 Dec 2015 16:36:10 +0100
 
+irssi (0.8.17-1ubuntu2) xenial; urgency=medium
+
+  * Rebuild for Perl 5.22.1.
+
+ -- Colin Watson <[e-mail]>  Fri, 18 Dec 2015 12:50:33 +0000
+
+irssi (0.8.17-1ubuntu1) vivid; urgency=low
+
+  * Merge from Debian testing (LP: #1423499).  Remaining changes:
+    - Refreshed 03firsttimer_text to follow upstream changes to formatting.
+    - Re-enabled 20fix_ssl_proxy_hostname_check.
+    - Refreshed 90irc-ubuntu-com to follow upstream changes to config file
+      formatting.
+
+ -- Daniel Watkins <[e-mail]>  Sun, 12 Oct 2014 09:44:38 +0000
+
 irssi (0.8.17-1) unstable; urgency=medium
 
   * The AdaCamp Berlin upload, new upstream stable release.
@@ -308,6 +687,36 @@ irssi (0.8.17~rc1-1) experimental; urgency=medium
 
  -- Rhonda D'Vine <[e-mail]>  Mon, 28 Jul 2014 16:29:23 +0200
 
+irssi (0.8.16-1ubuntu4) utopic; urgency=medium
+
+  * Refresh and re-enable 20fix_ssl_proxy_hostname_check.
+
+ -- Steve Langasek <[e-mail]>  Sat, 06 Sep 2014 23:15:51 -0700
+
+irssi (0.8.16-1ubuntu3) utopic; urgency=medium
+
+  * Rebuild for Perl 5.20.0.
+
+ -- Colin Watson <[e-mail]>  Thu, 21 Aug 2014 12:44:56 +0100
+
+irssi (0.8.16-1ubuntu2) utopic; urgency=medium
+
+  * Build witout libval-dev, it's in universe.
+
+ -- Daniel Holbach <[e-mail]>  Thu, 07 Aug 2014 14:32:37 +0200
+
+irssi (0.8.16-1ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable (LP: #1350364), remaining changes:
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to Freenode and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches/90irc-ubuntu-com:
+      + Refreshed and added network config.
+      + Set to connect over SSL. (LP: #978424)
+
+ -- Unit 193 <[e-mail]>  Wed, 06 Aug 2014 15:51:59 -0400
+
 irssi (0.8.16-1) unstable; urgency=medium
 
   [ Rhonda D'Vine ]
@@ -347,6 +756,28 @@ irssi (0.8.16~rc1-1) experimental; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Wed, 18 Sep 2013 12:20:27 +0200
 
+irssi (0.8.15-5ubuntu3) trusty; urgency=low
+
+  * Rebuild for Perl 5.18.
+
+ -- Colin Watson <[e-mail]>  Mon, 21 Oct 2013 13:39:24 +0100
+
+irssi (0.8.15-5ubuntu2) saucy; urgency=low
+
+  * Use dh_autotools-dev to update config.{sub,guess} for AArch64.
+
+ -- Matthias Klose <[e-mail]>  Wed, 09 Oct 2013 21:48:53 +0200
+
+irssi (0.8.15-5ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches/90irc-ubuntu-com
+
+ -- Stéphane Graber <[e-mail]>  Fri, 04 May 2012 15:44:37 -0400
+
 irssi (0.8.15-5) unstable; urgency=low
 
   * Updated bind_utf8-fix patch from upstream bug tracker again
@@ -356,6 +787,31 @@ irssi (0.8.15-5) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Tue, 24 Apr 2012 17:59:05 +0200
 
+irssi (0.8.15-4ubuntu3) precise; urgency=low
+
+  * Swap 18bind_utf8-fix from Debian's to the new one proposed upstream.
+    This fixes alt-backspace not working in irssi.
+    http://bugs.irssi.org/index.php?do=details&task_id=553
+    (LP: #874144)
+
+ -- Stéphane Graber <[e-mail]>  Wed, 04 Apr 2012 10:04:46 -0400
+
+irssi (0.8.15-4ubuntu2) precise; urgency=low
+
+  * Rebuild for Perl 5.14.
+
+ -- Colin Watson <[e-mail]>  Tue, 15 Nov 2011 23:38:11 +0000
+
+irssi (0.8.15-4ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable (LP: #796148), remaining changes:
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches/90irc-ubuntu-com
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <[e-mail]>  Sun, 12 Jun 2011 11:22:36 +0200
+
 irssi (0.8.15-4) unstable; urgency=medium
 
   * Update bind_utf8-fix patch from upstream bug tracker to fix issue with now
@@ -363,6 +819,16 @@ irssi (0.8.15-4) unstable; urgency=medium
 
  -- Gerfried Fuchs <[e-mail]>  Fri, 10 Jun 2011 20:13:15 +0200
 
+irssi (0.8.15-3ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable (LP: #776615), remaining changes:
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches/90irc-ubuntu-com
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <[e-mail]>  Tue, 03 May 2011 19:56:26 +0200
+
 irssi (0.8.15-3) unstable; urgency=low
 
   * Add patch bind_utf8-fix extracted from upstream bug #553 to enable binding
@@ -374,6 +840,20 @@ irssi (0.8.15-3) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Tue, 03 May 2011 11:47:58 +0200
 
+irssi (0.8.15-2ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable (LP: #691448), remaining changes:
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches/90irc-ubuntu-com
+    - debian/patches/91_disable_sslv2.patch: do not use SSLv2 protocol.
+      This can be dropped in 0.8.16.
+    - debian/patches/91_ssl_proxy.patch: when we have a proxy setting,
+      we expect the CN to match the proxy hostname, not the server hostname.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <[e-mail]>  Fri, 17 Dec 2010 22:38:11 +0100
+
 irssi (0.8.15-2) unstable; urgency=low
 
   * Switch Vcs-* field values to git.deb.at.
@@ -382,6 +862,23 @@ irssi (0.8.15-2) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Tue, 14 Dec 2010 21:57:29 +0100
 
+irssi (0.8.15-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable (LP: #589209), remaining changes:
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches/90irc-ubuntu-com
+    - debian/patches/91_disable_sslv2.patch: do not use SSLv2 protocol.
+      This can be dropped in 0.8.16.
+    - debian/patches/91_ssl_proxy.patch: when we have a proxy setting,
+      we expect the CN to match the proxy hostname, not the server hostname.
+  * Dropped changes, superseded upstream;
+    - debian/patches/91_CVE-2010-1155.patch
+    - debian/patches/91_CVE-2010-1156.patch
+
+ -- Lorenzo De Liso <[e-mail]>  Thu, 03 Jun 2010 16:30:52 +0200
+
 irssi (0.8.15-1) unstable; urgency=low
 
   * New Upstream version, prepared with current autotools (closes: #575295)
@@ -403,6 +900,46 @@ irssi (0.8.15~rc1-1) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Tue, 23 Mar 2010 21:33:44 +0100
 
+irssi (0.8.14-1ubuntu4) lucid; urgency=low
+
+  * 91_ssl_proxy.patch: when we have a proxy setting, we expect the CN to
+    match the proxy hostname, not the server hostname.  LP: #565182
+
+ -- Steve Langasek <[e-mail]>  Sat, 17 Apr 2010 04:18:10 +0000
+
+irssi (0.8.14-1ubuntu3) lucid; urgency=low
+
+  * SECURITY UPDATE: perform certificate host validation
+    - debian/patches/91_CVE-2010-1155.patch: adjust to verify hostname against
+      CN. Also use one SSL_CTX per connection and use default trusted CAs if
+      nothing specified. This can be dropped in 0.8.15.
+    - CVE-2010-1155
+  * SECURITY UPDATE: fix crash when checking for fuzzy nick match when not on
+    the channel
+    - debian/patches/91_CVE-2010-1156.patch: verify channel is non-NULL in
+      src/core/nicklist.c. This can be dropped in 0.8.15.
+    - CVE-2010-1156
+  * Do not use SSLv2 protocol. This can be dropped in 0.8.16.
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 14 Apr 2010 13:36:33 -0500
+
+irssi (0.8.14-1ubuntu2) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <[e-mail]>  Sat, 06 Mar 2010 13:28:50 +0100
+
+irssi (0.8.14-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #406890
+    - debian/patches: 03firsttimer_text
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches: 90irc-ubuntu-com
+
+ -- Bhavani Shankar <[e-mail]>  Thu, 30 Jul 2009 19:12:55 +0530
+
 irssi (0.8.14-1) unstable; urgency=low
 
   * New upstream release, dropping wallops-fix patch.
@@ -411,6 +948,16 @@ irssi (0.8.14-1) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Wed, 29 Jul 2009 12:55:04 +0200
 
+irssi (0.8.13-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #389748
+    - debian/patches: 03firsttimer_text
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches: 90irc-ubuntu-com
+
+ -- Bhavani Shankar <[e-mail]>  Sat, 20 Jun 2009 05:51:09 +0530
+
 irssi (0.8.13-2) unstable; urgency=medium
 
   * New patch:
@@ -419,6 +966,17 @@ irssi (0.8.13-2) unstable; urgency=medium
 
  -- Gerfried Fuchs <[e-mail]>  Tue, 16 Jun 2009 11:03:06 +0200
 
+irssi (0.8.13-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #372411), remaining changes:
+    - debian/patches: 03firsttimer_text
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+    - debian/patches: 90irc-ubuntu-com
+  * Fixed debian/patches/90irc-ubuntu-com for new irssi.conf.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 05 May 2009 15:50:50 -0500
+
 irssi (0.8.13-1) unstable; urgency=low
 
   * New upstream release.
@@ -441,6 +999,17 @@ irssi (0.8.13~rc1-1) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Thu, 19 Mar 2009 11:12:17 +0100
 
+irssi (0.8.12-6ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable (LP: #326002), Ubuntu remaining changes:
+    - Added debian/patches/90irc-ubuntu-com.dpatch
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+        New with this merge: We now also apply this patch.
+
+ -- Pedro Fragoso <[e-mail]>  Wed, 04 Feb 2009 21:46:19 +0000
+
 irssi (0.8.12-6) unstable; urgency=low
 
   * New patch:
@@ -452,6 +1021,18 @@ irssi (0.8.12-6) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Thu, 29 Jan 2009 13:29:51 +0100
 
+irssi (0.8.12-5ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable (LP: #295270), Ubuntu remaining changes:
+    - Added debian/patches/90irc-ubuntu-com.dpatch
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian.
+        New with this merge: We now also apply this patch.
+    - debian/irssi.perm: Don't remove alternative on upgrades.
+
+ -- Pedro Fragoso <[e-mail]>  Wed, 05 Nov 2008 02:41:00 +0000
+
 irssi (0.8.12-5) unstable; urgency=low
 
   * New patches:
@@ -463,6 +1044,28 @@ irssi (0.8.12-5) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Tue, 02 Sep 2008 13:57:52 +0200
 
+irssi (0.8.12-4ubuntu2) intrepid; urgency=low
+
+  * debian/patches/90irc-ubuntu-com.dpatch: Changed irc.ubuntu.com's
+    default port to 8001 to avoid DCC exploit (LP: #263259).
+
+ -- Jonathan Patrick Davies <[e-mail]>  Sun, 31 Aug 2008 12:28:41 +0100
+
+irssi (0.8.12-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #241282), remaining changes:
+    - Added debian/patches/90irc-ubuntu-com.dpatch (LP: #52690)
+    - debian/patches/03firsttimer_text:
+      + Adapt it so it tells you about connecting to irc.ubuntu.com and
+        joining #ubuntu instead of irc.debian.org and #debian. (LP: #188590)
+        New with this merge: We now also apply this patch.
+    - Modify Maintainer value to match DebianMaintainerField spec.
+    - debian/irssi.perm: Don't remove alternative on upgrades. (LP: #67698)
+  * debian/patches/91-manpage-typo:
+    - Dropped, merged upstream.
+
+ -- Pedro Fragoso <[e-mail]>  Wed, 11 Jun 2008 15:36:34 +0100
+
 irssi (0.8.12-4) unstable; urgency=low
 
   * Remove alternative handling cleanup from before etch release.
@@ -488,6 +1091,36 @@ irssi (0.8.12-4) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Mon, 09 Jun 2008 12:11:19 +0200
 
+irssi (0.8.12-3ubuntu4) intrepid; urgency=low
+
+  * Rebuild for the perl 5.10 transition (LP: #230016).
+
+ -- Michael Bienia <[e-mail]>  Sat, 24 May 2008 15:02:30 +0200
+
+irssi (0.8.12-3ubuntu3) hardy; urgency=low
+
+  * Replace authentification with a less amusing word
+
+ -- John Dong <[e-mail]>  Fri, 08 Feb 2008 20:57:33 -0500
+
+irssi (0.8.12-3ubuntu2) hardy; urgency=low
+
+  * debian/patches/03firsttimer_text:
+    - Adapt it so it tells you about connecting to irc.ubuntu.com and
+      joining #ubuntu, instead of irc.debian.org and #debian. LP: #188590.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Wed, 06 Feb 2008 00:59:54 +0100
+
+irssi (0.8.12-3ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #181641):
+    - Added debian/patches/90irc-ubuntu-com.dpatch (Launchpad #52690).
+      New with this merge: We now also apply this patch.
+    - Modify Maintainer value to match the DebianMaintainerField spec.
+    - debian/irssi.prerm: Don't remove alternative on upgrades (LP #67698).
+
+ -- Soren Hansen <[e-mail]>  Tue, 05 Feb 2008 23:17:04 +0100
+
 irssi (0.8.12-3) unstable; urgency=low
 
   [ Gerfried Fuchs ]
@@ -508,6 +1141,22 @@ irssi (0.8.12-3) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Thu, 17 Jan 2008 09:55:41 +0100
 
+irssi (0.8.12-2ubuntu2) hardy; urgency=low
+
+  * debian/patches/10ping_ctcp: prevent /ping with no arguments from sending
+    CTCP PING to a channel (backported from SVN, LP: #96758).
+
+ -- Pedro Fragoso <[e-mail]>  Tue, 04 Dec 2007 19:40:59 +0000
+
+irssi (0.8.12-2ubuntu1) hardy; urgency=low
+
+  * Merge with Debian, remaining Ubuntu changes:
+    - Added debian/patches/90irc-ubuntu-com.dpatch (Launchpad #52690).
+    - Modify Maintainer value to match the DebianMaintainerField spec.
+    - debian/irssi.prerm: Do not alternative. LP: #67698.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Fri, 02 Nov 2007 18:13:28 +0100
+
 irssi (0.8.12-2) unstable; urgency=low
 
   [ Gerfried Fuchs ]
@@ -545,6 +1194,25 @@ irssi (0.8.12-1) unstable; urgency=low
 
  -- Gerfried Fuchs <[e-mail]>  Wed, 17 Oct 2007 07:54:49 +0200
 
+irssi (0.8.11-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release:
+    - http://www.irssi.org/news/ChangeLog
+  * debian/{control,compat}:
+    - Bump Standards.
+  * debian/patches/00list:
+    - Disable 05upgrade-check-binary.patch, applied upstream.
+    - Disable 08doublefree.patch, applied upstream.
+
+ -- Christian Bjälevik <[e-mail]>  Sat, 28 Apr 2007 02:52:01 +0200
+
+irssi (0.8.10-2ubuntu1) edgy; urgency=low
+
+  * Add irc.ubuntu.com as the first listed IRC server (closes: Malone
+    #52690).
+
+ -- Colin Watson <[e-mail]>  Tue,  3 Oct 2006 17:46:55 +0100
+
 irssi (0.8.10-2) unstable; urgency=low
 
   * Fix Conflicts and Replaces lines to make backporting to sarge easier
@@ -595,3 +1263,4 @@ irssi (0.8.10~rc5-1) unstable; urgency=low
     using the deprecated g_strdown() (pushed upstream) (Closes: #232628)
 
  -- David Pashley <[e-mail]>  Sun, 10 Jul 2005 15:11:38 +0300
+
diff --git a/debian/control b/debian/control
index 13adeed..4debba6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: irssi
 Section: net
 Priority: optional
-Maintainer: Rhonda D'Vine <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Rhonda D'Vine <[e-mail]>
 Build-Depends: debhelper-compat (= 13), libglib2.0-dev,
   perl (>= 5.8.1), libperl-dev (>= 5.8.1), libncurses5-dev, libssl-dev,
   openssl, libotr5-dev
diff --git a/debian/patches/03firsttimer_text b/debian/patches/03firsttimer_text
index 7552c18..f80b2ee 100644
--- a/debian/patches/03firsttimer_text
+++ b/debian/patches/03firsttimer_text
@@ -8,7 +8,7 @@ Description: add hint about #debian to first time user message, BTS #393707
  	  "|___|_| /__/__/_|%:"
  	  "Irssi v$J - https://irssi.org", 0 },
 +
-+	/* add debian informations for first time users,
++	/* add Ubuntu informations for first time users,
 +	 * see debian bug #393707 */
  	{ "welcome_firsttime",
  	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
@@ -18,8 +18,8 @@ Description: add hint about #debian to first time user message, BTS #393707
  	  "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%:"
++	  "For Ubuntu specific help type \"/connect freenode\" and%:"
++	  "\"/join #ubuntu\" (without the quotes) and ask your%:"
 +	  "question.%:"
  	  "- - - - - - - - - - - - - - - - - - - - - - - - - - - -", 0 },
  	{ "welcome_init_settings", "The following settings were initialized", 0 },
diff --git a/debian/patches/series b/debian/patches/series
index 30558b8..0099ba7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,8 +4,7 @@
 ## 06gnutls-support by David Pashley <[e-mail]>
 #06gnutls-support
 12manpage-fix
-## disabled for now, doesn't apply in new codebase, ahf takes a look
-#20fix_ssl_proxy_hostname_check
+20fix_ssl_proxy_hostname_check
 22fix-perl-hardening
 25tls-ssl-compat-defines
 26glib-2-63.patch