diff --git a/irssi-CVE-2009-1959.patch b/irssi-CVE-2009-1959.patch new file mode 100644 index 0000000..1d67d32 --- /dev/null +++ b/irssi-CVE-2009-1959.patch @@ -0,0 +1,11 @@ +--- irssi-0.8.13/src/fe-common/irc/fe-events.c 2008/11/09 23:06:37 4889 ++++ irssi-0.8.13/src/fe-common/irc/fe-events.c 2009/05/15 11:54:33 5068 +@@ -298,7 +298,7 @@ + + tmp = g_strdup(data+8); + len = strlen(tmp); +- if (tmp[len-1] == 1) tmp[len-1] = '\0'; ++ if (len >= 1 && tmp[len-1] == 1) tmp[len-1] = '\0'; + printformat(server, NULL, MSGLEVEL_WALLOPS, IRCTXT_ACTION_WALLOPS, nick, tmp); + g_free(tmp); + } diff --git a/irssi-config.h b/irssi-config.h new file mode 100644 index 0000000..b393e7a --- /dev/null +++ b/irssi-config.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "irssi-config-32.h" +#elif __WORDSIZE == 64 +#include "irssi-config-64.h" +#else +#error "Unknown word size" +#endif diff --git a/irssi.spec b/irssi.spec index 4cf6649..03f9afb 100644 --- a/irssi.spec +++ b/irssi.spec @@ -2,20 +2,19 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi -Version: 0.8.10 -Release: 6.a%{?dist} +Version: 0.8.13 +Release: 2%{?dist} -License: GPL +License: GPLv2+ Group: Applications/Communications URL: http://irssi.org/ -Source0: http://irssi.org/files/irssi-%{version}a.tar.bz2 -Patch0: irssi-0.8.10-dcc-unregister.patch +Source0: http://irssi.org/files/irssi-%{version}.tar.gz +Source1: irssi-config.h +Patch0: irssi-CVE-2009-1959.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ncurses-devel openssl-devel zlib-devel -BuildRequires: pkgconfig glib2-devel -# BuildRequires: gc-devel - -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: pkgconfig glib2-devel perl(ExtUtils::Embed) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %package devel Summary: Development package for irssi @@ -37,32 +36,32 @@ being maintained. %prep %setup -q -n %{name}-%{version} -%patch0 -p0 - +%patch0 -p1 %build %configure --enable-ipv6 --with-textui \ --with-proxy \ --with-bot \ - --with-perl=module \ + --with-perl=yes \ --with-perl-lib=vendor -# --with-gc -make %{?_smp_mflags} + +make %{_smp_mflags} +mv irssi-config.h irssi-config-$(getconf LONG_BIT).h +cp -p %{SOURCE1} irssi-config.h %install rm -rf $RPM_BUILD_ROOT -%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p" +install -p irssi-config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/irssi-config-$(getconf LONG_BIT).h -# Clean up rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name} find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';' - -# Fix permissions chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch} + %clean rm -rf $RPM_BUILD_ROOT @@ -82,9 +81,61 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%{_includedir}/irssi +%{_includedir}/irssi/ + %changelog +* Tue Jun 23 2009 Huzaifa Sidhpurwala - 0.8.13-2 +- Resolve CVE-2009-1959 + +* Fri May 1 2009 Marek Mahut - 0.8.13-1 +- Upstream release + +* Wed Feb 25 2009 Fedora Release Engineering - 0.8.12-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 17 2009 Tomas Mraz - 0.8.12-12 +- rebuild with new openssl + +* Fri Aug 29 2008 Michael Schwendt - 0.8.12-11 +- Don't include any C header files in main package. + +* Fri Mar 7 2008 Tom "spot" Callaway - 0.8.12-10 +- BR: perl(ExtUtils::Embed) + +* Thu Mar 06 2008 Tom "spot" Callaway - 0.8.12-9 +- Rebuild for new perl + +* Sat Mar 1 2008 Marek Mahut - 0.8.12-8 +- Fix for multiarch conflict (BZ#341591) + +* Tue Feb 19 2008 Fedora Release Engineering - 0.8.12-5 +- Autorebuild for GCC 4.3 + +* Sun Nov 11 2007 Marek Mahut - 0.8.12-3 +- Enabling perl build-in support as per request in BZ#375121 + +* Mon Oct 08 2007 Marek Mahut - 0.8.12-1 +- New release +- Fixes bug from BZ#239511, dropping patch + +* Sun Aug 19 2007 Marek Mahut - 0.8.11-5 +- Fixing properly irssi-support-meta-cursor-xterm.patch + +* Thu Aug 16 2007 Marek Mahut - 0.8.11-4 +- Added irssi-support-meta-cursor-xterm.patch (BZ#239511) + +* Thu Aug 16 2007 Marek Mahut - 0.8.11-2 +- Updating license tag +- Rebuild for 0.8.11 + +* Wed May 2 2007 Dams - 0.8.11-1 +- Updated to 0.8.11 +- Dropped patch0 + +* Sat Apr 21 2007 Dams - 0.8.10-7.a +- Release bump + * Sun Sep 17 2006 Dams - 0.8.10-6.a - Bumped release diff --git a/sources b/sources index 02496da..35e5edb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38e616bccb6a34ff6d91690317c2fa19 irssi-0.8.10a.tar.bz2 +226f194576895ff3075c164523806d06 irssi-0.8.13.tar.gz