--- weechat-0.2.6.1.orig/debian/weechat-gtk.install +++ weechat-0.2.6.1/debian/weechat-gtk.install @@ -0,0 +1 @@ +usr/bin/weechat-gtk --- weechat-0.2.6.1.orig/debian/weechat-curses.manpages +++ weechat-0.2.6.1/debian/weechat-curses.manpages @@ -0,0 +1 @@ +doc/weechat-curses.1 --- weechat-0.2.6.1.orig/debian/control +++ weechat-0.2.6.1/debian/control @@ -1,15 +1,21 @@ Source: weechat Section: net Priority: optional -Maintainer: Sebastien Helleu -Uploaders: Julien Louis +Maintainer: Emmanuel Bouthenot Build-Depends-Indep: xsltproc, docbook-xsl, docbook-xml -Build-Depends: cdbs, debhelper (>= 5), libncursesw5-dev, ruby, ruby1.8-dev, libperl-dev, python-dev, libaspell-dev, liblualib50-dev, libgnutls-dev, libtool, dpkg-dev (>= 1.13.19) -Standards-Version: 3.7.2 +Build-Depends: cdbs, debhelper (>= 5), libncursesw5-dev, ruby, ruby1.8-dev, + libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev, libgnutls-dev, libtool, + dpkg-dev (>= 1.13.19), pkg-config, quilt (>= 0.40) +Standards-Version: 3.8.1 +Homepage: http://weechat.flashtux.org/ +Vcs-Git: git://git.debian.org/users/kolter-guest/weechat.git +Vcs-Browser: http://git.debian.org/git/users/kolter-guest/weechat.git +DM-Upload-Allowed: yes Package: weechat Architecture: all -Depends: weechat-common (= ${source:Version}), weechat-curses (>= ${binary:Version}) +Depends: ${misc:Depends}, weechat-common (= ${source:Version}), + weechat-curses (>= ${binary:Version}) Description: Fast, light and extensible IRC client WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client for many operating systems. Everything can be done with a keyboard. @@ -21,39 +27,33 @@ - double charset support (decode/encode) - FIFO pipe for remote control - and much more! - . - Homepage: http://weechat.flashtux.org/ Package: weechat-curses Architecture: any -Depends: ${shlibs:Depends}, weechat-common (= ${source:Version}) +Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-common (= ${source:Version}) Recommends: weechat-plugins (= ${binary:Version}) -Description: Fast, light and extensible IRC client +Description: Fast, light and extensible IRC client - console client WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client for many operating systems. Everything can be done with a keyboard. - It is customizable and extensible with plugins/scripts, and includes: - - nicklist - - smart hotlist - - infobar with highlight notification - - horizontal and vertical split - - double charset support (decode/encode) - - FIFO pipe for remote control - - and much more! . - Homepage: http://weechat.flashtux.org/ + This package provides the console client (ncurses). Package: weechat-common Architecture: all +Depends: ${misc:Depends}, base-files (>= 4.0.1~bpo40+1) Replaces: weechat Recommends: weechat-curses Description: Common files for WeeChat - Documentation, examples, and locale files for WeeChat - fast, light and - extensible IRC client. It is useless without weechat-curses. + French, English and German documentation (html), examples, and locale + files for WeeChat - fast, light and extensible IRC client. It is useless + without weechat-curses. Package: weechat-plugins Architecture: any -Depends: ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Suggests: weechat-scripts Description: Plugins for WeeChat - This package provides some plugins to enhance weechat with scripting languages - such as perl python or ruby. + This package provides some plugins to enhance WeeChat: + - Perl, Python, Ruby and Lua scripting. + - Spell checking (thanks to aspell). + - Charsets management. --- weechat-0.2.6.1.orig/debian/weechat-curses.menu +++ weechat-0.2.6.1/debian/weechat-curses.menu @@ -1,4 +1,4 @@ -?package(weechat-curses):needs="text" section="Apps/Net" \ +?package(weechat-curses):needs="text" section="Applications/Network/Communication" \ title="weechat-curses" \ icon="/usr/share/pixmaps/weechat.xpm" \ command="/usr/bin/weechat-curses" --- weechat-0.2.6.1.orig/debian/changelog +++ weechat-0.2.6.1/debian/changelog @@ -1,3 +1,87 @@ +weechat (0.2.6.1-1~bpo40+1) etch-backports; urgency=low + + * Rebuilt for etch (Fix for CVE-2009-0661. This fixes a remote + DoS vulnerability found and reported by Sebastien Helleu). + * Add depends on base-files >= 4.0.1~bpo40+1 (switch to GPLv3). + + -- Emmanuel Bouthenot Mon, 16 Mar 2009 23:05:15 +0000 + +weechat (0.2.6.1-1) unstable; urgency=low + + * New upstream release which includes a fix against a possible remote + Denial of Service (crash) while receiving messages with special chars + (Closes: #519940). + * Refresh patch multiple_ip_servers according to the new upstream release. + * Update Standards-Version to 3.8.1. + + -- Emmanuel Bouthenot Mon, 16 Mar 2009 13:18:29 +0000 + +weechat (0.2.6-3) unstable; urgency=low + + * Add a patch to make weechat try to connect other server IPs + when the first one failed. Thanks to Lionel Elie Mamane for + his patch (Closes: #498610). + * Rename patch 01_perlembed_init_macros to perlembed_init_macros. + * Update debian/control: + - add ${misc:Depends} + - update descriptions + * Update debian/copyright about debian packaging. + * Add Vcs-Browser and Vcs-Git fields in debian/control. + * Add DM-Upload-Allowed field. + + -- Emmanuel Bouthenot Sat, 21 Feb 2009 18:34:08 +0000 + +weechat (0.2.6-2) unstable; urgency=low + + * Setting me as maintainer with previous maintainer agreement. + * Remove Uploaders field. + * Add quilt to Build-Depends. + * Add a patch to fix probable pthread mutex locks on hppa architecture + with perl plugin (Closes: #495080). + * Add a Homepage field. + * Update Standards-Version to 3.8.0. + * Reformat NEWS file to avoid lintian warnings. + * Fix typos in control file. + + -- Emmanuel Bouthenot Sun, 07 Sep 2008 19:39:42 +0000 + +weechat (0.2.6-1) unstable; urgency=low + + * New Upstream Version + * Switch to GPLv3 (update copyright) + * Update menu entry + + -- Emmanuel Bouthenot Thu, 06 Sep 2007 20:10:26 +0200 + +weechat (0.2.5-1) unstable; urgency=low + + * New Upstream Version + + -- Julien Louis Tue, 12 Jun 2007 19:42:15 +0200 + +weechat (0.2.4-2) unstable; urgency=low + + * Backport iso-2022-jp patch from upstream CVS (Closes: #421833). + * Set myself as Maintainer with previous Maintainer agreement. + + -- Julien Louis Thu, 03 May 2007 21:15:59 +0200 + +weechat (0.2.4-1) unstable; urgency=low + + * New upstream release + + -- Julien Louis Thu, 29 Mar 2007 21:01:46 +0200 + +weechat (0.2.3-1) unstable; urgency=low + + * New upstream release + * Bump lua build-dependency to liblua5.1-0-dev + * Add pkg-config to Build-Depends + * Remove some duplited changelog entries. + * Improve weechat-plugins description + + -- Julien Louis Fri, 12 Jan 2007 09:01:46 +0100 + weechat (0.2.1-1) unstable; urgency=low * New upstream release @@ -215,129 +299,3 @@ * First version. -- FlashCode Sat, 27 Sep 2003 12:00:00 +0200 -weechat (0.1.5-1) unstable; urgency=low - - * New upstream release - - -- Julien Louis Sat, 24 Sep 2005 14:08:55 +0200 - -weechat (0.1.4-2) unstable; urgency=low - - * Add autotools-dev to Build-Depends. - * update autotools stuff automatically to always - have up-to-date config.{guess,sub} - * Update Build-Depends: libgnutls11-dev -> libgnutls-dev - - -- Julien Louis Mon, 1 Aug 2005 11:46:39 +0200 - -weechat (0.1.4-1) unstable; urgency=low - - * New upstream release. - - -- Julien Louis Sat, 30 Jul 2005 16:26:55 +0200 - -weechat (0.1.3-2) unstable; urgency=low - - * Update config.{guess,sub} to fix FTBFS on k*BSD (Closes: #316791) - - -- Julien Louis Fri, 8 Jul 2005 21:30:38 +0200 - -weechat (0.1.3-1) unstable; urgency=low - - * New upstream release. - - -- Julien Louis Sat, 2 Jul 2005 20:06:29 +0200 - -weechat (0.1.2-3) unstable; urgency=low - - * Apply patch against gui-display.c to fix curses color bug. - * remove dh_install --sourcedir to allow builds on woody. - - -- Julien Louis Sun, 19 Jun 2005 22:37:11 +0200 - -weechat (0.1.2-2) unstable; urgency=low - - * Patch src/gui/curse/gui-display.c to fix segfault - when config file does not exists (Closes: #310589). - - -- Julien Louis Tue, 24 May 2005 20:55:02 +0200 - -weechat (0.1.2-1) unstable; urgency=low - - * WeeChat version 0.1.2, see ChangeLog for detail. - - -- Sebastien Helleu Sat, 21 May 2005 08:00:00 +0200 - -weechat (0.1.1-2) unstable; urgency=low - - * debian/control: - - Add myself to uploaders. - - Remove unecessary dependency on weechat-gtk (Closes: #308287). - - -- Julien Louis Tue, 10 May 2005 22:38:52 +0200 - -weechat (0.1.1-1) unstable; urgency=low - - * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492) - - -- Sebastien Helleu Sat, 20 Mar 2005 08:00:00 +0200 - -weechat (0.1.0-1) unstable; urgency=low - - * WeeChat version 0.1.0, see ChangeLog for detail. - - -- Sebastien Helleu Sat, 12 Feb 2005 12:00:00 +0200 - -weechat (0.0.9-1) unstable; urgency=low - - * WeeChat version 0.0.9, see ChangeLog for detail. - - -- FlashCode Sat, 01 Jan 2005 13:00:00 +0200 - -weechat (0.0.8-1) unstable; urgency=low - - * WeeChat version 0.0.8, see ChangeLog for detail. - - -- FlashCode Sat, 30 Oct 2004 11:40:00 +0200 - -weechat (0.0.7-1) unstable; urgency=low - - * WeeChat version 0.0.7, see ChangeLog for detail. - - -- FlashCode Sat, 08 Aug 2004 21:00:00 +0200 - -weechat (0.0.6-1) unstable; urgency=low - - * WeeChat version 0.0.6, see ChangeLog for detail. - - -- FlashCode Sat, 05 Jun 2004 11:30:00 +0200 - -weechat (0.0.5-1) unstable; urgency=low - - * WeeChat version 0.0.5, see ChangeLog for detail. - - -- FlashCode Sat, 07 Feb 2004 20:30:00 +0200 - -weechat (0.0.4-1) unstable; urgency=low - - * WeeChat version 0.0.4, see ChangeLog for detail. - - -- FlashCode Thu, 01 Jan 2004 13:00:00 +0200 - -weechat (0.0.3-1) unstable; urgency=low - - * WeeChat version 0.0.3, see ChangeLog for detail. - - -- FlashCode Mon, 03 Nov 2003 23:15:00 +0200 - -weechat (0.0.2-1) unstable; urgency=low - - * WeeChat version 0.0.2, see ChangeLog for detail. - - -- FlashCode Sun, 05 Oct 2003 12:00:00 +0200 - -weechat (0.0.1-1) unstable; urgency=low - - * First version. - - -- FlashCode Sat, 27 Sep 2003 12:00:00 +0200 --- weechat-0.2.6.1.orig/debian/weechat-plugins.dirs +++ weechat-0.2.6.1/debian/weechat-plugins.dirs @@ -0,0 +1 @@ +usr/lib --- weechat-0.2.6.1.orig/debian/patches/aspell_spelling_errors +++ weechat-0.2.6.1/debian/patches/aspell_spelling_errors @@ -0,0 +1,36 @@ +Fix typos with the words 'useful' and 'dictionary'. +--- a/src/plugins/aspell/weechat-aspell.c ++++ b/src/plugins/aspell/weechat-aspell.c +@@ -425,7 +425,7 @@ + el = aspell_dict_info_list_elements (l); + di = NULL; + +- weechat_aspell_plugin->print (weechat_aspell_plugin, NULL, NULL, "[%s] *** dictionnaries list :", _PLUGIN_NAME); ++ weechat_aspell_plugin->print (weechat_aspell_plugin, NULL, NULL, "[%s] *** dictionaries list :", _PLUGIN_NAME); + + while (( di = aspell_dict_info_enumeration_next (el))) + { +@@ -533,7 +533,7 @@ + + if (ret) + weechat_aspell_plugin->print (weechat_aspell_plugin, NULL, NULL, +- "[%s] [ADD-WORD] word '%s' successfully added in your personnal dictionnary", ++ "[%s] [ADD-WORD] word '%s' successfully added in your personnal dictionary", + _PLUGIN_NAME, word); + else + weechat_aspell_plugin->print (weechat_aspell_plugin, NULL, NULL, +@@ -1341,12 +1341,12 @@ + + snprintf (help, sizeof(help), + " show : show plugin configuration\n" +- "dictlist : show installed dictionnaries\n" ++ "dictlist : show installed dictionaries\n" + " save : save plugin configuration\n" + " enable : enable aspell on current channel/server\n" + " disable : disable aspell on current channel/server\n" + "add-word : add a word in your personnal aspell dict\n" +- " dump : show plugins internals (usefull for debug)\n" ++ " dump : show plugins internals (useful for debug)\n" + " set : setting options\n" + " OPTION := { word-size SIZE | toogle-check-mode | color COLOR }\n" + " word-size : minimum size for a word to be checked (default : %d)\n" --- weechat-0.2.6.1.orig/debian/patches/perlembed_init_macros +++ weechat-0.2.6.1/debian/patches/perlembed_init_macros @@ -0,0 +1,69 @@ +Patch to fix probable pthread mutex locks on hppa architecture with perl plugin +--- a/src/plugins/scripts/perl/weechat-perl.c ++++ b/src/plugins/scripts/perl/weechat-perl.c +@@ -61,6 +61,9 @@ + int perl_num = 0; + #endif + ++char *perl_args[] = { "", "-e", "0", "-w", NULL }; ++int perl_args_count = 4; ++ + char *perl_weechat_code = + { + #ifndef MULTIPLICITY +@@ -1961,7 +1964,6 @@ + char pkgname[64]; + #else + PerlInterpreter *perl_current_interpreter; +- char *perl_args[] = { "", "-e", "0" }; + #endif + + plugin->print_server (plugin, "Loading Perl script \"%s\"", filename); +@@ -1997,7 +1999,7 @@ + PERL_SET_CONTEXT (perl_current_interpreter); + perl_construct (perl_current_interpreter); + tempscript.interpreter = (PerlInterpreter *) perl_current_interpreter; +- perl_parse (perl_current_interpreter, weechat_perl_xs_init, 3, perl_args, NULL); ++ perl_parse (perl_current_interpreter, weechat_perl_xs_init, perl_args_count, perl_args, NULL); + + eval_pv (perl_weechat_code, TRUE); + eval = weechat_perl_exec (plugin, &tempscript, +@@ -2376,13 +2378,16 @@ + int + weechat_plugin_init (t_weechat_plugin *plugin) + { ++#ifdef PERL_SYS_INIT3 ++ int a = perl_args_count; ++ char *perl_env[] = {}; ++ PERL_SYS_INIT3 (&a, (char ***)&perl_args, (char ***)&perl_env); ++#endif + perl_plugin = plugin; + + #ifdef MULTIPLICITY + plugin->print_server (plugin, "Loading Perl module \"weechat\""); + #else +- char *perl_args[] = { "", "-e", "0" }; +- + plugin->print_server (plugin, "Loading Perl module \"weechat\" (without multiplicity)"); + + perl_main = perl_alloc (); +@@ -2395,7 +2400,7 @@ + } + + perl_construct (perl_main); +- perl_parse (perl_main, weechat_perl_xs_init, 3, perl_args, NULL); ++ perl_parse (perl_main, weechat_perl_xs_init, perl_args_count, perl_args, NULL); + eval_pv (perl_weechat_code, TRUE); + #endif + +@@ -2436,6 +2441,10 @@ + perl_main = NULL; + } + #endif ++ ++#ifdef PERL_SYS_TERM ++ PERL_SYS_TERM (); ++#endif + + perl_plugin->print_server (perl_plugin, + "Perl plugin ended"); --- weechat-0.2.6.1.orig/debian/patches/multiple_ip_servers +++ weechat-0.2.6.1/debian/patches/multiple_ip_servers @@ -0,0 +1,83 @@ +Patch to make weechat try to connect other server IPs when the first one failed +--- a/src/irc/irc-server.c ++++ b/src/irc/irc-server.c +@@ -1697,8 +1697,9 @@ + int + irc_server_child (t_irc_server *server) + { +- struct addrinfo hints, *res, *res_local; ++ struct addrinfo hints, *res, *res_local, *res_iter; + int rc; ++ char *child_result; + + res = NULL; + res_local = NULL; +@@ -1746,6 +1747,8 @@ + freeaddrinfo (res); + return 0; + } ++ ++ child_result="0"; + } + else + { +@@ -1784,37 +1787,36 @@ + write (server->child_write, "1", 1); + if (res) + freeaddrinfo (res); +- return 0; +- } +- if ((server->ipv6 && (res->ai_family != AF_INET6)) +- || ((!server->ipv6 && (res->ai_family != AF_INET)))) +- { +- write (server->child_write, "2", 1); +- if (res) +- freeaddrinfo (res); + if (res_local) + freeaddrinfo (res_local); + return 0; + } +- +- /* connect to server */ +- if (server->ipv6) +- ((struct sockaddr_in6 *)(res->ai_addr))->sin6_port = htons (server->port); +- else +- ((struct sockaddr_in *)(res->ai_addr))->sin_port = htons (server->port); +- +- if (connect (server->sock, res->ai_addr, res->ai_addrlen) != 0) ++ ++ child_result = "2"; ++ ++ for (res_iter=res; res_iter != NULL; res_iter=res_iter->ai_next) + { +- write (server->child_write, "3", 1); +- if (res) +- freeaddrinfo (res); +- if (res_local) +- freeaddrinfo (res_local); +- return 0; ++ if ((server->ipv6 && (res_iter->ai_family != AF_INET6)) ++ || ((!server->ipv6 && (res_iter->ai_family != AF_INET)))) ++ continue; ++ ++ child_result="3"; ++ ++ /* connect to server */ ++ if (server->ipv6) ++ ((struct sockaddr_in6 *)(res_iter->ai_addr))->sin6_port = htons (server->port); ++ else ++ ((struct sockaddr_in *)(res_iter->ai_addr))->sin_port = htons (server->port); ++ ++ if (connect (server->sock, res_iter->ai_addr, res_iter->ai_addrlen) == 0) ++ { ++ child_result="0"; ++ break; ++ } + } + } + +- write (server->child_write, "0", 1); ++ write (server->child_write, child_result, 1); + if (res) + freeaddrinfo (res); + if (res_local) --- weechat-0.2.6.1.orig/debian/patches/series +++ weechat-0.2.6.1/debian/patches/series @@ -0,0 +1,3 @@ +multiple_ip_servers +perlembed_init_macros +aspell_spelling_errors --- weechat-0.2.6.1.orig/debian/watch +++ weechat-0.2.6.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://weechat.flashtux.org/download/weechat-(\d.*)\.tar\.bz2 --- weechat-0.2.6.1.orig/debian/NEWS +++ weechat-0.2.6.1/debian/NEWS @@ -1,6 +1,7 @@ weechat (0.1.6-1) unstable; urgency=low - This release introduces some incompatible changes with old scripts and locale - support, you can read the upstream NEWS file for more information. + * This release introduces some incompatible changes with old scripts + and locale support, you can read the upstream NEWS file for more + information. -- Julien Louis Fri, 11 Nov 2005 20:45:46 +0100 --- weechat-0.2.6.1.orig/debian/rules +++ weechat-0.2.6.1/debian/rules @@ -2,6 +2,8 @@ # Sample debian/rules that uses cdbs. Originaly written by Robert Millan. # This file is public domain. +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + DEB_AUTO_CLEANUP_RCS := yes # Add here any variable or target overrides you need --- weechat-0.2.6.1.orig/debian/weechat-gtk.dirs +++ weechat-0.2.6.1/debian/weechat-gtk.dirs @@ -0,0 +1 @@ +usr/bin --- weechat-0.2.6.1.orig/debian/copyright +++ weechat-0.2.6.1/debian/copyright @@ -3,17 +3,21 @@ It was downloaded from http://weechat.flashtux.org/download -Upstream Authors: - - FlashCode - - kolter - Copyright: + 2003-2009 FlashCode + Emmanuel Bouthenot + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at +the Free Software Foundation; either version 3 of the License, or (at your option) any later version. On Debian systems, the complete text of the GNU General Public -License, Version 2 can be found in the file -/usr/share/common-licenses/GPL +License, Version 3 can be found in the file +/usr/share/common-licenses/GPL-3 + + +Debian packaging (licenced under the GPLv2) : + Copyright(C) 2005-2008, Julien Louis + Copyright(C) 2008-2009, Emmanuel Bouthenot