diff -u irssi-0.8.15/debian/changelog irssi-0.8.15/debian/changelog --- irssi-0.8.15/debian/changelog +++ irssi-0.8.15/debian/changelog @@ -1,3 +1,18 @@ +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. + LP: #565182 + + -- Lorenzo De Liso 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) @@ -19,6 +34,46 @@ -- Gerfried Fuchs 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 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 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 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 Thu, 30 Jul 2009 19:12:55 +0530 + irssi (0.8.14-1) unstable; urgency=low * New upstream release, dropping wallops-fix patch. @@ -27,6 +82,16 @@ -- Gerfried Fuchs 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 Sat, 20 Jun 2009 05:51:09 +0530 + irssi (0.8.13-2) unstable; urgency=medium * New patch: @@ -35,6 +100,17 @@ -- Gerfried Fuchs 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 Tue, 05 May 2009 15:50:50 -0500 + irssi (0.8.13-1) unstable; urgency=low * New upstream release. @@ -57,6 +133,17 @@ -- Gerfried Fuchs 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 Wed, 04 Feb 2009 21:46:19 +0000 + irssi (0.8.12-6) unstable; urgency=low * New patch: @@ -68,6 +155,18 @@ -- Gerfried Fuchs 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 Wed, 05 Nov 2008 02:41:00 +0000 + irssi (0.8.12-5) unstable; urgency=low * New patches: @@ -79,6 +178,28 @@ -- Gerfried Fuchs 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 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 Wed, 11 Jun 2008 15:36:34 +0100 + irssi (0.8.12-4) unstable; urgency=low * Remove alternative handling cleanup from before etch release. @@ -104,6 +225,36 @@ -- Gerfried Fuchs 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 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 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 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 Tue, 05 Feb 2008 23:17:04 +0100 + irssi (0.8.12-3) unstable; urgency=low [ Gerfried Fuchs ] @@ -124,6 +275,22 @@ -- Gerfried Fuchs 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 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 Fri, 02 Nov 2007 18:13:28 +0100 + irssi (0.8.12-2) unstable; urgency=low [ Gerfried Fuchs ] @@ -161,6 +328,25 @@ -- Gerfried Fuchs 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 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 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 diff -u irssi-0.8.15/debian/control irssi-0.8.15/debian/control --- irssi-0.8.15/debian/control +++ irssi-0.8.15/debian/control @@ -1,7 +1,8 @@ Source: irssi Section: net Priority: optional -Maintainer: Gerfried Fuchs +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Gerfried Fuchs Build-Depends: debhelper (>= 5), autotools-dev, libglib2.0-dev, perl (>= 5.8.1), libperl-dev (>= 5.8.1), libncurses5-dev, libssl-dev, openssl, quilt Standards-Version: 3.8.4 Homepage: http://irssi.org/ only in patch2: unchanged: --- irssi-0.8.15.orig/debian/patches/90irc-ubuntu-com +++ irssi-0.8.15/debian/patches/90irc-ubuntu-com @@ -0,0 +1,10 @@ +Index: irssi-0.8.13-1ubuntu1/irssi.conf +=================================================================== +--- irssi-0.8.13-1ubuntu1.orig/irssi.conf 2009-05-05 15:39:37.000000000 -0500 ++++ irssi-0.8.13-1ubuntu1/irssi.conf 2009-05-05 15:40:52.000000000 -0500 +@@ -1,4 +1,5 @@ + servers = ( ++ { address = "irc.ubuntu.com"; chatnet = "Ubuntu"; port = "8001"; }, + { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; }, + { address = "irc.open-ircnet.net"; chatnet = "IRCnet"; port = "6667"; }, + { address = "irc.efnet.org"; chatnet = "EFNet"; port = "6667"; }, only in patch2: unchanged: --- irssi-0.8.15.orig/debian/patches/91_ssl_proxy.patch +++ irssi-0.8.15/debian/patches/91_ssl_proxy.patch @@ -0,0 +1,24 @@ +Index: irssi-0.8.14/src/core/servers.c +=================================================================== +--- irssi-0.8.14.orig/src/core/servers.c ++++ irssi-0.8.14/src/core/servers.c +@@ -209,6 +209,7 @@ + char *errmsg2; + char ipaddr[MAX_IP_LEN]; + int port; ++ char *hostname; + + g_return_if_fail(ip != NULL || unix_socket != NULL); + +@@ -223,8 +224,10 @@ + server->connrec->own_ip4); + port = server->connrec->proxy != NULL ? + server->connrec->proxy_port : server->connrec->port; ++ hostname = server->connrec->proxy != NULL ? ++ server->connrec->proxy : server->connrec->address; + handle = server->connrec->use_ssl ? +- net_connect_ip_ssl(ip, port, server->connrec->address, own_ip, server->connrec->ssl_cert, server->connrec->ssl_pkey, ++ net_connect_ip_ssl(ip, port, hostname, own_ip, server->connrec->ssl_cert, server->connrec->ssl_pkey, + server->connrec->ssl_cafile, server->connrec->ssl_capath, server->connrec->ssl_verify) : + net_connect_ip(ip, port, own_ip); + } else { only in patch2: unchanged: --- irssi-0.8.15.orig/debian/patches/91_disable_sslv2.patch +++ irssi-0.8.15/debian/patches/91_disable_sslv2.patch @@ -0,0 +1,14 @@ +Origin: r5136 +Description: Do not use SSLv2 protocol. From Bazerka. + +diff -Nur irssi-0.8.14/src/core/network-openssl.c irssi-0.8.14.new/src/core/network-openssl.c +--- irssi-0.8.14/src/core/network-openssl.c 2010-04-14 13:35:32.240201673 -0500 ++++ irssi-0.8.14.new/src/core/network-openssl.c 2010-04-14 13:35:43.950433414 -0500 +@@ -406,6 +406,7 @@ + g_error("Could not allocate memory for SSL context"); + return NULL; + } ++ SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2); + + if (mycert && *mycert) { + char *scert = NULL, *spkey = NULL;