From a2b82d1cd2503569d72e854d9cfde73cf15c28b6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:20 +0000 Subject: [PATCH 01/34] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93a31d5..a283000 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := znc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 57d7984982df7fa3a9a8220d87b4ed27e670e3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Sun, 6 Dec 2009 23:41:29 +0000 Subject: [PATCH 02/34] - rebuild against perl 5.10.1 --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 6a01f20..dadf930 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.076 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -125,6 +125,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog +* Fri Dec 4 2009 Stepan Kasal - 0.076-3 +- rebuild against perl 5.10.1 + * Fri Sep 25 2009 Nick Bebout - 0.076-2 - Fix missing dist tag From 544317477e794647af82382d5133c82afaee8cc3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 16:17:00 +0000 Subject: [PATCH 03/34] Update to svn1672 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 36 +++++++++++++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c28c3cf..d6b7048 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.076.tar.gz +znc-0.077-1.svn1672.tar.bz2 diff --git a/sources b/sources index f72444d..6493758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03c2804b91225e83884f06078f6db568 znc-0.076.tar.gz +7d264293123b4d3572dbbac757bddf7d znc-0.077-1.svn1672.tar.bz2 diff --git a/znc.spec b/znc.spec index dadf930..72e6f90 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,14 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.076 -Release: 3%{?dist} +Version: 0.077 +Release: 1.svn1672%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +#Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz +# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 +# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 +Source0: znc-0.077-1.svn1672.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -125,6 +128,33 @@ chmod -x modules/q.cpp %{_libdir}/znc/send_raw.so %changelog + +* Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 +- Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) +- Users cloned via the admin module no longer automatically connect into IRC. (r1653) +- Inform new clients about their /away status. (r1655) +- The "BUG" messages from route_replies can now be turned off via /msg *route_replies silent yes. (r1660) +- Rewrite znc.conf on SIGUSR1. (r1666) +- ISpoofFormat now supports ExpandString. (r1670) +- Allow specifing port and password for delserver. (r1640) +- Write the config file on restart and shutdown. (r1641) +- Disable c-ares if it is not found unless --enable-c-ares was used. (r1644) (r1645) +- blockuser was missing an admin check. (r1648) +- Sometimes, removing a server caused znc to lose track of which server it is connected to. (r1659) +- Include a more portable header for uint32_t in SHA256.h. (r1665) +- Fixed cases where ZNC didn't properly block PONG replies to its own PINGs. (r1668) +- Fixed a possible crash if a client disconnected before an auth module was able to verify the login. (r1669) +- Away allowed to accidentally execute IRC commands. (r1672) +- Comment out some weird code in Client.cpp. (r1646) +- Remove connect_throttle since it's obsoleted by fail2ban. (r1649) +- Remove outdated sample znc.conf. (r1654) +- route_replies now got a higher timeout before it generates a "BUG" message. (r1657) +- Documented the signals on which znc reacts better. (r1667) +- New module hook OnIRCConnecting(). (r1638) +- Remove obsolete CUtils::GetHashPass(). (r1642) +- A module's GetDescription() now returns a C-String. (r1661) (r1662) +- When opening a module, check the version number first and don't do anything on a mismatch. (r1663) + * Fri Dec 4 2009 Stepan Kasal - 0.076-3 - rebuild against perl 5.10.1 From c3fc63d363c47d4ab1e2cdf8d523007ae4cc3248 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 16:25:58 +0000 Subject: [PATCH 04/34] Fix broken spec --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 72e6f90..d0b936d 100644 --- a/znc.spec +++ b/znc.spec @@ -44,7 +44,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.077-1.svn1672 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From dc6793e9aca78008c3b0539f4212a19c3bfc83c8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 16:34:28 +0000 Subject: [PATCH 05/34] Remove znc.conf from spec --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d0b936d..f740b24 100644 --- a/znc.spec +++ b/znc.spec @@ -63,7 +63,7 @@ chmod -x modules/q.cpp %files %defattr(-,root,root) -%doc AUTHORS LICENSE LICENSE.OpenSSL README znc.conf +%doc AUTHORS LICENSE LICENSE.OpenSSL README %{_bindir}/znc %{_mandir}/man1/* #%{_libdir}/znc/ From 4ecab1285ea848766bd719be9bc154db352d857a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Dec 2009 16:42:03 +0000 Subject: [PATCH 06/34] Remove connect_throttle.so from spec --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index f740b24..46a6c86 100644 --- a/znc.spec +++ b/znc.spec @@ -115,7 +115,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/blockuser.so -%{_libdir}/znc/connect_throttle.so +#%{_libdir}/znc/connect_throttle.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so From 03c2bb0b89d8219417cb73bb855562939163d3af Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 14 Dec 2009 05:48:28 +0000 Subject: [PATCH 07/34] Update to 0.078-rc1 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6b7048..30add97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.077-1.svn1672.tar.bz2 +znc-0.078-rc1.tar.gz diff --git a/sources b/sources index 6493758..8095693 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d264293123b4d3572dbbac757bddf7d znc-0.077-1.svn1672.tar.bz2 +57002305905f3e389492d46629bc7f40 znc-0.078-rc1.tar.gz diff --git a/znc.spec b/znc.spec index 46a6c86..75244cc 100644 --- a/znc.spec +++ b/znc.spec @@ -1,14 +1,15 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.077 -Release: 1.svn1672%{?dist} +Version: 0.078 +Release: 0.2.rc1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz # To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 # Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 -Source0: znc-0.077-1.svn1672.tar.bz2 +# Source0: znc-0.077-1.svn1672.tar.bz2 +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.078-rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl @@ -44,7 +45,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.077-1.svn1672 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -129,6 +130,8 @@ chmod -x modules/q.cpp %changelog +* Sun Dec 13 2009 Nick Bebout - 0.078-0.1.rc1 +- Update to znc 0.078.rc1 * Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) - Users cloned via the admin module no longer automatically connect into IRC. (r1653) From f6ae170479a46a8f65ed9fbcfabccd14519dba7a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 30 Dec 2009 20:52:34 +0000 Subject: [PATCH 08/34] Upgrade to ZNC 0.078 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 30add97..f695a8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.078-rc1.tar.gz +znc-0.078.tar.gz diff --git a/sources b/sources index 8095693..0e8d150 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -57002305905f3e389492d46629bc7f40 znc-0.078-rc1.tar.gz +b1379bd6609353ebbc8df7ec19bd004f znc-0.078.tar.gz diff --git a/znc.spec b/znc.spec index 75244cc..6c8d331 100644 --- a/znc.spec +++ b/znc.spec @@ -1,18 +1,14 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.078 -Release: 0.2.rc1%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/znc/znc-0.076.tar.gz -# To get source, svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc-0.077-1.svn1672 -# Then tar jvcf znc-0.077-1.svn1672.tar.bz2 znc-0.077-1.svn1672 -# Source0: znc-0.077-1.svn1672.tar.bz2 -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.078-rc1.tar.gz +Source0: http://downloads.sourceforge.net/znc/znc-0.078.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl +BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel @@ -130,8 +126,12 @@ chmod -x modules/q.cpp %changelog +* Wed Dec 30 2009 Nick Bebout - 0.078-1 +- Update to znc 0.078 + * Sun Dec 13 2009 Nick Bebout - 0.078-0.1.rc1 - Update to znc 0.078.rc1 + * Mon Dec 7 2009 Nick Bebout - 0.077-1.svn1672 - Add a DCCVHost config option which specifies the VHost (IP only!) for DCC bouncing. (r1647) - Users cloned via the admin module no longer automatically connect into IRC. (r1653) From 2fcab81e0b7298cee974ce417faeb6b7455cfeb3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 18 Feb 2010 19:07:59 +0000 Subject: [PATCH 09/34] Upgrade to ZNC 0.080 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f695a8e..9d0efb2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.078.tar.gz +znc-0.080.tar.gz diff --git a/sources b/sources index 0e8d150..b00f3b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1379bd6609353ebbc8df7ec19bd004f znc-0.078.tar.gz +4f8b64705315dd5733f2a47a70c89ffa znc-0.080.tar.gz diff --git a/znc.spec b/znc.spec index 6c8d331..22d2fac 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.078 +Version: 0.080 Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.078.tar.gz +Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -74,6 +74,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/awaynick.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/chansaver.so +%{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so %{_libdir}/znc/email.so %{_libdir}/znc/fail2ban.so @@ -112,11 +113,12 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/blockuser.so -#%{_libdir}/znc/connect_throttle.so +%{_libdir}/znc/block_motd.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so %{_libdir}/znc/fakeonline.so +%{_libdir}/znc/flooddetach.so %{_libdir}/znc/lastseen.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so @@ -126,6 +128,9 @@ chmod -x modules/q.cpp %changelog +* Thu Feb 18 2010 Nick Bebout - 0.080-1 +- Update to znc 0.080 + * Wed Dec 30 2009 Nick Bebout - 0.078-1 - Update to znc 0.078 From 77820b1facaf2d27bd68239ec2f738a157c0a329 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 30 Mar 2010 03:50:06 +0000 Subject: [PATCH 10/34] Update to znc 0.081 svn1850 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index b00f3b4..449009c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f8b64705315dd5733f2a47a70c89ffa znc-0.080.tar.gz +3917784e50dde825b459ba08102ce77b znc-0.081-svn1850.tar.bz2 From 0067daa24d7d23a85109d32321c0c821bffa75ad Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 30 Mar 2010 03:55:54 +0000 Subject: [PATCH 11/34] Update to znc 0.081 svn1850 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 14 +++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9d0efb2..943f0b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.080.tar.gz +znc-0.081-svn1850.tar.bz2 diff --git a/sources b/sources index 449009c..aacb07a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3917784e50dde825b459ba08102ce77b znc-0.081-svn1850.tar.bz2 +bcb0111bb4edf174577b8e2788e95a95 znc-0.081-svn1850.tar.bz2 diff --git a/znc.spec b/znc.spec index 22d2fac..186a5e4 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,16 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.080 -Release: 1%{?dist} +Version: 0.081 +Release: 1.svn1850%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz +#Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz +Source0: znc-0.081-svn1850.tar.bz2 +# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc +# mv znc znc-0.081-svn1850 +# tar cjvf znc-0.081-svn1850.tar.bz2 znc-0.081-svn1850/ + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -128,6 +133,9 @@ chmod -x modules/q.cpp %changelog +* Mon Mar 29 2010 Nick Bebout - 0.081-1.svn1850 +- Update to znc 0.081.svn1850 + * Thu Feb 18 2010 Nick Bebout - 0.080-1 - Update to znc 0.080 From a5764c7908dbb59fcbabdf9d1be81e57a612cac2 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 30 Mar 2010 04:06:57 +0000 Subject: [PATCH 12/34] Fix spec --- znc.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/znc.spec b/znc.spec index 186a5e4..64fc659 100644 --- a/znc.spec +++ b/znc.spec @@ -90,6 +90,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/modperl.pm %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so +%{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so %{_libdir}/znc/perform.so %{_libdir}/znc/q.so @@ -104,6 +105,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so +%{_libdir}/znc/webchat.so +%{_libdir}/znc/webskins/ +%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel From adbbc765a3f27df096a78954319aae499dca6e42 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 8 Apr 2010 01:33:40 +0000 Subject: [PATCH 13/34] Update to svn 1897 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 943f0b1..f383640 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.081-svn1850.tar.bz2 +znc-0.081-svn1897.tar.bz2 diff --git a/sources b/sources index aacb07a..9c79a01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcb0111bb4edf174577b8e2788e95a95 znc-0.081-svn1850.tar.bz2 +d07e5e8ba75998cd0f10c00eb12a44c2 znc-0.081-svn1897.tar.bz2 diff --git a/znc.spec b/znc.spec index 64fc659..61f1d2c 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,15 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.081 -Release: 1.svn1850%{?dist} +Release: 2.svn1897%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.081-svn1850.tar.bz2 +Source0: znc-0.081-svn1897.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.081-svn1850 -# tar cjvf znc-0.081-svn1850.tar.bz2 znc-0.081-svn1850/ +# mv znc znc-0.081-svn1897 +# tar cjvf znc-0.081-svn1897.tar.bz2 znc-0.081-svn1897/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -137,6 +137,9 @@ chmod -x modules/q.cpp %changelog +* Wed Apr 7 2010 Nick Bebout - 0.081-2.svn1897 +- Update to znc 0.081.svn1897 + * Mon Mar 29 2010 Nick Bebout - 0.081-1.svn1850 - Update to znc 0.081.svn1850 From b96efbe2846a3f125988c1718262655c6b11404c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 26 Apr 2010 02:56:57 +0000 Subject: [PATCH 14/34] Update to znc 0.089-svn1944 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 32 +++++++++++++++++--------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index f383640..67306d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.081-svn1897.tar.bz2 +znc-0.089-svn1944.tar.bz2 diff --git a/sources b/sources index 9c79a01..0c3d709 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d07e5e8ba75998cd0f10c00eb12a44c2 znc-0.081-svn1897.tar.bz2 +6bf5ad6be6d2267664c063bb6a153c85 znc-0.089-svn1944.tar.bz2 diff --git a/znc.spec b/znc.spec index 61f1d2c..df8f0a0 100644 --- a/znc.spec +++ b/znc.spec @@ -1,16 +1,15 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.081 -Release: 2.svn1897%{?dist} +Version: 0.089 +Release: 1.svn1944%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.081-svn1897.tar.bz2 +Source0: znc-0.089-svn1944.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.081-svn1897 -# tar cjvf znc-0.081-svn1897.tar.bz2 znc-0.081-svn1897/ - +# mv znc znc-0.089 +# tar cjvf znc-0.089-svn1944.tar.bz2 znc-0.089/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -53,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-sasl --enable-extra + --enable-ipv6 --enable-extra --disable-perl %__make %{?_smp_mflags} %install @@ -77,16 +76,17 @@ chmod -x modules/q.cpp %{_libdir}/znc/autoreply.so %{_libdir}/znc/away.so %{_libdir}/znc/awaynick.so +%{_libdir}/znc/blockuser.so %{_libdir}/znc/buffextras.so %{_libdir}/znc/chansaver.so %{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so -%{_libdir}/znc/email.so +%{_libdir}/znc/disconkick.so %{_libdir}/znc/fail2ban.so %{_libdir}/znc/fixfreenode.so -%{_libdir}/znc/imapauth.so %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so +%{_libdir}/znc/lastseen.so %{_libdir}/znc/modperl.pm %{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so @@ -100,14 +100,13 @@ chmod -x modules/q.cpp %{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so -%{_libdir}/znc/shell.so %{_libdir}/znc/simple_away.so %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so -%{_libdir}/znc/webchat.so +#%{_libdir}/znc/webchat.so %{_libdir}/znc/webskins/ -%{_libdir}/znc/www/ +#%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -121,22 +120,25 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so -%{_libdir}/znc/blockuser.so %{_libdir}/znc/block_motd.so %{_libdir}/znc/ctcpflood.so -%{_libdir}/znc/discon_kick.so %{_libdir}/znc/droproot.so +%{_libdir}/znc/email.so %{_libdir}/znc/fakeonline.so %{_libdir}/znc/flooddetach.so -%{_libdir}/znc/lastseen.so +%{_libdir}/znc/imapchat.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so %{_libdir}/znc/send_raw.so +%{_libdir}/znc/shell.so %changelog +* Sun Apr 25 2010 Nick Bebout - 0.081-2.svn1897 - Update to znc 0.081.svn1897 From d1da58710ab9c1ad67edf668f800a7a60f8ce587 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 26 Apr 2010 02:58:44 +0000 Subject: [PATCH 15/34] Update SPEC --- znc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/znc.spec b/znc.spec index df8f0a0..7ffb25d 100644 --- a/znc.spec +++ b/znc.spec @@ -87,8 +87,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so %{_libdir}/znc/lastseen.so -%{_libdir}/znc/modperl.pm -%{_libdir}/znc/modperl.so +#%{_libdir}/znc/modperl.pm +#%{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so %{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so @@ -97,7 +97,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so -%{_libdir}/znc/saslauth.so +#%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so %{_libdir}/znc/simple_away.so From 83adccfcd45433e09f8e484b8597f1cfc6db7c79 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 26 Apr 2010 03:05:52 +0000 Subject: [PATCH 16/34] Update SPEC --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 7ffb25d..39bdfaa 100644 --- a/znc.spec +++ b/znc.spec @@ -126,7 +126,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/email.so %{_libdir}/znc/fakeonline.so %{_libdir}/znc/flooddetach.so -%{_libdir}/znc/imapchat.so +%{_libdir}/znc/imapauth.so %{_libdir}/znc/listsockets.so %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so From 67e92bd6209b64a4bdf3eb998e51a325b2487711 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 02:33:16 +0000 Subject: [PATCH 17/34] Update to ZNC 0.089.svn2000 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 67306d7..2831b5f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.089-svn1944.tar.bz2 +znc-0.089-svn2000.tar.bz2 diff --git a/sources b/sources index 0c3d709..936963c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6bf5ad6be6d2267664c063bb6a153c85 znc-0.089-svn1944.tar.bz2 +a3e729a2962d0fd398ab43ed0416abca znc-0.089-svn2000.tar.bz2 diff --git a/znc.spec b/znc.spec index 39bdfaa..bb99dd7 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,15 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 1.svn1944%{?dist} +Release: 4.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.089-svn1944.tar.bz2 +Source0: znc-0.089-svn2000.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc # mv znc znc-0.089 -# tar cjvf znc-0.089-svn1944.tar.bz2 znc-0.089/ +# tar cjvf znc-0.089-svn2000.tar.bz2 znc-0.089/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -105,7 +105,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so #%{_libdir}/znc/webchat.so -%{_libdir}/znc/webskins/ +#%{_libdir}/znc/webskins/ #%{_libdir}/znc/www/ %{_datadir}/znc/ @@ -121,6 +121,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/antiidle.so %{_libdir}/znc/autovoice.so %{_libdir}/znc/block_motd.so +%{_libdir}/znc/charset.so %{_libdir}/znc/ctcpflood.so %{_libdir}/znc/droproot.so %{_libdir}/znc/email.so @@ -131,12 +132,16 @@ chmod -x modules/q.cpp %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so +#%(_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so %changelog -* Sun Apr 25 2010 Nick Bebout - 0.089-4.svn2000 +- Update to znc 0.089.svn2000 + +* Sun Apr 25 2010 Nick Bebout - 0.089-3.svn1944 - Update to znc 0.089.svn1944 * Wed Apr 7 2010 Nick Bebout - 0.081-2.svn1897 From e3ae4f432ef386fd10dbdad15609e340fdd7b90f Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 02:40:59 +0000 Subject: [PATCH 18/34] Add send_raw and shell to modules --- znc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/znc.spec b/znc.spec index bb99dd7..8a31c31 100644 --- a/znc.spec +++ b/znc.spec @@ -100,6 +100,8 @@ chmod -x modules/q.cpp #%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so +%{_libdir}/znc/send_raw.so +%{_libdir}/znc/shell.so %{_libdir}/znc/simple_away.so %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so From 3abbb3e877f6c77027623b9e92b789ccc560b547 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 02:49:20 +0000 Subject: [PATCH 19/34] Re-enable modperl --- znc.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index 8a31c31..8851ea3 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 4.svn2000%{?dist} +Release: 5.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -52,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --disable-perl + --enable-ipv6 --enable-extra %__make %{?_smp_mflags} %install @@ -87,8 +87,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/keepnick.so %{_libdir}/znc/kickrejoin.so %{_libdir}/znc/lastseen.so -#%{_libdir}/znc/modperl.pm -#%{_libdir}/znc/modperl.so +%{_libdir}/znc/modperl.pm +%{_libdir}/znc/modperl.so %{_libdir}/znc/nickserv.so %{_libdir}/znc/notes.so %{_libdir}/znc/partyline.so @@ -140,6 +140,9 @@ chmod -x modules/q.cpp %changelog +* Tue May 18 2010 Nick Bebout - 0.089-5.svn2000 +- Re-enable modperl + * Tue May 18 2010 Nick Bebout - 0.089-4.svn2000 - Update to znc 0.089.svn2000 From 282abf7ed8f94ff09277b5ff14de77119c38d869 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:00:47 +0000 Subject: [PATCH 20/34] Re-enable modperl --- znc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 8851ea3..0078de8 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 5.svn2000%{?dist} +Release: 6.svn2000%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ @@ -52,7 +52,7 @@ chmod -x modules/q.cpp %build %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra + --enable-ipv6 --enable-extra --enable-sasl %__make %{?_smp_mflags} %install @@ -140,6 +140,9 @@ chmod -x modules/q.cpp %changelog +* Tue May 18 2010 Nick Bebout - 0.089-6.svn2000 +- Re-enable saslauth + * Tue May 18 2010 Nick Bebout - 0.089-5.svn2000 - Re-enable modperl From 698e5e65f6151dfafb6e425e4e1117340f8e503d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:06:25 +0000 Subject: [PATCH 21/34] Re-enable saslauth module --- znc.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/znc.spec b/znc.spec index 0078de8..14fcdbe 100644 --- a/znc.spec +++ b/znc.spec @@ -67,7 +67,6 @@ chmod -x modules/q.cpp %doc AUTHORS LICENSE LICENSE.OpenSSL README %{_bindir}/znc %{_mandir}/man1/* -#%{_libdir}/znc/ %{_libdir}/znc/admin.so %{_libdir}/znc/adminlog.so %{_libdir}/znc/autoattach.so @@ -97,7 +96,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/raw.so %{_libdir}/znc/route_replies.so %{_libdir}/znc/sample.so -#%{_libdir}/znc/saslauth.so %{_libdir}/znc/savebuff.so %{_libdir}/znc/schat.so %{_libdir}/znc/send_raw.so @@ -106,9 +104,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/stickychan.so %{_libdir}/znc/watch.so %{_libdir}/znc/webadmin.so -#%{_libdir}/znc/webchat.so -#%{_libdir}/znc/webskins/ -#%{_libdir}/znc/www/ %{_datadir}/znc/ %files devel @@ -134,7 +129,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so -#%(_libdir}/znc/saslauth.so +%(_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so From 55f0bc399956fc10350a64a63e80f12189505a84 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 19 May 2010 03:24:39 +0000 Subject: [PATCH 22/34] Fix typo in re-enabling saslauth module --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index 14fcdbe..c4c30c7 100644 --- a/znc.spec +++ b/znc.spec @@ -129,7 +129,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/log.so %{_libdir}/znc/motdfile.so %{_libdir}/znc/notify_connect.so -%(_libdir}/znc/saslauth.so +%{_libdir}/znc/saslauth.so %{_libdir}/znc/send_raw.so %{_libdir}/znc/shell.so From 9c49b80ed0286a3a0db93d499551bda819296fda Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 28 May 2010 02:18:00 +0000 Subject: [PATCH 23/34] Update to znc 0.089-7.svn2004 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2831b5f..6886a72 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.089-svn2000.tar.bz2 +znc-0.089-svn2004.tar.bz2 diff --git a/sources b/sources index 936963c..b02a455 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3e729a2962d0fd398ab43ed0416abca znc-0.089-svn2000.tar.bz2 +41a2282c10a1e99bb6e377ff675ecfa0 znc-0.089-svn2004.tar.bz2 diff --git a/znc.spec b/znc.spec index c4c30c7..2d86449 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,15 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.089 -Release: 6.svn2000%{?dist} +Release: 7.svn2004%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.089-svn2000.tar.bz2 +Source0: znc-0.089-svn2004.tar.bz2 # svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc # mv znc znc-0.089 -# tar cjvf znc-0.089-svn2000.tar.bz2 znc-0.089/ +# tar cjvf znc-0.089-svn2004.tar.bz2 znc-0.089/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -135,6 +135,9 @@ chmod -x modules/q.cpp %changelog +* Thu May 27 2010 Nick Bebout - 0.089-7.svn2004 +- Update to znc 0.089.svn2004 + * Tue May 18 2010 Nick Bebout - 0.089-6.svn2000 - Re-enable saslauth From 137fd377560ffc46114e4b6594a2d12041d8d3d4 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 28 May 2010 03:56:59 +0000 Subject: [PATCH 24/34] Update to ZNC 0.090-rc1 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6886a72..dfc1974 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.089-svn2004.tar.bz2 +znc-0.090-rc1.tar.gz diff --git a/sources b/sources index b02a455..ee48d8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41a2282c10a1e99bb6e377ff675ecfa0 znc-0.089-svn2004.tar.bz2 +914b8c2aef7b9582a1884bf42e6c2c93 znc-0.090-rc1.tar.gz diff --git a/znc.spec b/znc.spec index 2d86449..e52618a 100644 --- a/znc.spec +++ b/znc.spec @@ -1,15 +1,11 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.089 -Release: 7.svn2004%{?dist} +Version: 0.090 +Release: 0.1.rc1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -#Source0: http://downloads.sourceforge.net/znc/znc-0.080.tar.gz -Source0: znc-0.089-svn2004.tar.bz2 -# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk znc -# mv znc znc-0.089 -# tar cjvf znc-0.089-svn2004.tar.bz2 znc-0.089/ +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.090-rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -45,7 +41,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.090-rc1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -135,6 +131,9 @@ chmod -x modules/q.cpp %changelog +* Thu May 27 2010 Nick Bebout - 0.090-0.1.rc1 +- Update to znc 0.090-rc1 + * Thu May 27 2010 Nick Bebout - 0.089-7.svn2004 - Update to znc 0.089.svn2004 From cc4c1cb9aaebf3a9204d775672a00398447af708 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sun, 6 Jun 2010 23:02:09 +0000 Subject: [PATCH 25/34] Upgrade to ZNC 0.090 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index dfc1974..697a95d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.090-rc1.tar.gz +znc-0.090.tar.gz diff --git a/sources b/sources index ee48d8b..a0f9d9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -914b8c2aef7b9582a1884bf42e6c2c93 znc-0.090-rc1.tar.gz +d3ffe4f53211e5a425c7b87e9ca41e84 znc-0.090.tar.gz diff --git a/znc.spec b/znc.spec index e52618a..db71acd 100644 --- a/znc.spec +++ b/znc.spec @@ -1,11 +1,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.090 -Release: 0.1.rc1%{?dist} +#Release: 0.1.rc1%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://people.znc.in/~psychon/znc/releases/znc-0.090-rc1.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -41,7 +42,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.090-rc1 +%setup -q %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -130,6 +131,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Sun Jun 06 2010 Nick Bebout - 0.090-1 +- Update to znc 0.090 * Thu May 27 2010 Nick Bebout - 0.090-0.1.rc1 - Update to znc 0.090-rc1 From 33c06aaefe4810d0686de48411dcdc836a570c9b Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 7 Jun 2010 00:09:35 +0000 Subject: [PATCH 26/34] Fix perl(ExtUtils::Embed) BuildRequires to not break on EL-5/EL-6 --- znc.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/znc.spec b/znc.spec index db71acd..53464bc 100644 --- a/znc.spec +++ b/znc.spec @@ -13,10 +13,7 @@ BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel - -# The following line is necessary because this module -# is needed for Fedora, but not for EPEL. -%{?fedora:BuildRequires: perl-ExtUtils-Embed} +BuildRequires: perl(ExtUtils::Embed) %description ZNC is an IRC bouncer with many advanced features like detaching, From 144e94435514a50a9d2552fffc73057a93b131d7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 16 Jun 2010 21:57:20 +0000 Subject: [PATCH 27/34] Backport r2026 of ZNC subversion repo to fix bug 603915 znc: NULL pointer dereference flaw leads to segfault under certain conditions --- znc-trafficstats.patch | 31 +++++++++++++++++++++++++++++++ znc.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 znc-trafficstats.patch diff --git a/znc-trafficstats.patch b/znc-trafficstats.patch new file mode 100644 index 0000000..da04c8e --- /dev/null +++ b/znc-trafficstats.patch @@ -0,0 +1,31 @@ +--- znc-0.090/znc.cpp 2010-05-10 12:45:15.000000000 -0500 ++++ trunk/znc.cpp 2010-06-16 16:43:48.706323545 -0500 +@@ -1914,18 +1914,18 @@ + } + + for (CSockManager::const_iterator it = m_Manager.begin(); it != m_Manager.end(); ++it) { ++ CUser *pUser = NULL; + if ((*it)->GetSockName().Left(5) == "IRC::") { +- CIRCSock *p = (CIRCSock *) *it; +- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); +- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); +- uiUsers_in += p->GetBytesRead(); +- uiUsers_out += p->GetBytesWritten(); ++ pUser = ((CIRCSock *) *it)->GetUser(); + } else if ((*it)->GetSockName().Left(5) == "USR::") { +- CClient *p = (CClient *) *it; +- ret[p->GetUser()->GetUserName()].first += p->GetBytesRead(); +- ret[p->GetUser()->GetUserName()].second += p->GetBytesWritten(); +- uiUsers_in += p->GetBytesRead(); +- uiUsers_out += p->GetBytesWritten(); ++ pUser = ((CClient*) *it)->GetUser(); ++ } ++ ++ if (pUser) { ++ ret[pUser->GetUserName()].first += (*it)->GetBytesRead(); ++ ret[pUser->GetUserName()].second += (*it)->GetBytesWritten(); ++ uiUsers_in += (*it)->GetBytesRead(); ++ uiUsers_out += (*it)->GetBytesWritten(); + } else { + uiZNC_in += (*it)->GetBytesRead(); + uiZNC_out += (*it)->GetBytesWritten(); diff --git a/znc.spec b/znc.spec index 53464bc..3c1ed84 100644 --- a/znc.spec +++ b/znc.spec @@ -2,11 +2,12 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.090 #Release: 0.1.rc1%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -40,6 +41,7 @@ Extra modules for ZNC %prep %setup -q +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -128,6 +130,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Wed Jun 16 2010 Nick Bebout - 0.090-2 +- Backport r2026 of ZNC subversion repo to fix +- Bug 603915 - znc: NULL pointer dereference flaw leads to segfault under certain conditions * Sun Jun 06 2010 Nick Bebout - 0.090-1 - Update to znc 0.090 From 8d8e2079ea096caa67b16e2f3dc6f38c1a5853d7 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 16 Jun 2010 22:08:21 +0000 Subject: [PATCH 28/34] Update spec changelog --- znc.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/znc.spec b/znc.spec index 3c1ed84..5482783 100644 --- a/znc.spec +++ b/znc.spec @@ -131,8 +131,9 @@ chmod -x modules/q.cpp %changelog * Wed Jun 16 2010 Nick Bebout - 0.090-2 -- Backport r2026 of ZNC subversion repo to fix -- Bug 603915 - znc: NULL pointer dereference flaw leads to segfault under certain conditions +- Backport r2026 of ZNC subversion repo to fix bug 603915 +- NULL pointer dereference flaw leads to segfault under certain conditions + * Sun Jun 06 2010 Nick Bebout - 0.090-1 - Update to znc 0.090 From 8094560ebad5442ad8085d0810b90a6f440575ac Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 14 Jul 2010 05:32:40 +0000 Subject: [PATCH 29/34] Update to znc 0.092 --- .cvsignore | 2 +- sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 697a95d..05901f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-0.090.tar.gz +znc-0.092.tar.gz diff --git a/sources b/sources index a0f9d9a..e4be904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3ffe4f53211e5a425c7b87e9ca41e84 znc-0.090.tar.gz +e800a70c932dd13bc09b63569b49db3a znc-0.092.tar.gz diff --git a/znc.spec b/znc.spec index 5482783..8743ff8 100644 --- a/znc.spec +++ b/znc.spec @@ -1,13 +1,13 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.090 +Version: 0.092 #Release: 0.1.rc1%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: znc-trafficstats.patch +#Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ @@ -130,6 +130,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Wed Jul 14 2010 Nick Bebout - 0.092-1 +- Update to znc 0.092 + * Wed Jun 16 2010 Nick Bebout - 0.090-2 - Backport r2026 of ZNC subversion repo to fix bug 603915 - NULL pointer dereference flaw leads to segfault under certain conditions From 8c5829950fbb64f55046ca1fb714dbfadd34b04b Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 23 Jul 2010 03:00:33 +0000 Subject: [PATCH 30/34] Update to ZNC 0.092 --- znc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/znc.spec b/znc.spec index 8743ff8..1ab0103 100644 --- a/znc.spec +++ b/znc.spec @@ -41,7 +41,6 @@ Extra modules for ZNC %prep %setup -q -%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp From abde845561ab269d1fd31005f48c4d6cbf6c5b68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:32:24 +0000 Subject: [PATCH 31/34] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a283000..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: znc -# $Id$ -NAME := znc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index e01942a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -znc-0_070-7_fc11:HEAD:znc-0.070-7.fc11.src.rpm:1247453867 From fa6a42859bb0aa96be8817eb253c4a9cbf2b13cc Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 3 Aug 2010 14:03:55 -0400 Subject: [PATCH 32/34] Update to znc 0.093.svn2098 --- .gitignore | 1 + sources | 2 +- znc.spec | 17 +++++++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 05901f4..5f7ccc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ znc-0.092.tar.gz +znc-0.093.svn2098.tar.bz2 diff --git a/sources b/sources index e4be904..26a003a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e800a70c932dd13bc09b63569b49db3a znc-0.092.tar.gz +8691a1c6417bed41e6a75a600dafd41b znc-0.093.svn2098.tar.bz2 diff --git a/znc.spec b/znc.spec index 1ab0103..2429a9e 100644 --- a/znc.spec +++ b/znc.spec @@ -1,12 +1,17 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.092 +Version: 0.093 +Release: 1.svn2098%{?dist} #Release: 0.1.rc1%{?dist} -Release: 1%{?dist} +#Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: znc-0.093.svn2098.tar.bz2 +# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.093.svn2098 +# tar jcvf znc-0.093.svn2098.tar.bz2 znc-0.093.svn2098/ #Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -40,7 +45,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q +%setup -q -n znc-0.093.svn2098 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -72,6 +77,7 @@ chmod -x modules/q.cpp %{_libdir}/znc/awaynick.so %{_libdir}/znc/blockuser.so %{_libdir}/znc/buffextras.so +%{_libdir}/znc/certauth.so %{_libdir}/znc/chansaver.so %{_libdir}/znc/clientnotify.so %{_libdir}/znc/crypt.so @@ -129,6 +135,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Tue Aug 3 2010 Nick Bebout - 0.093-1.svn2098 +- Update to znc 0.093 svn2098 + * Wed Jul 14 2010 Nick Bebout - 0.092-1 - Update to znc 0.092 From fe20d167ca620d6fc6ec16af368f6d1e0abbb68c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 10 Aug 2010 20:06:44 -0400 Subject: [PATCH 33/34] Update to znc-0.093.svn2101 to fix two CVE's --- .gitignore | 1 + sources | 2 +- znc.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5f7ccc6..09fc48a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ znc-0.092.tar.gz znc-0.093.svn2098.tar.bz2 +znc-0.093.svn2101.tar.bz2 diff --git a/sources b/sources index 26a003a..5bd07db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8691a1c6417bed41e6a75a600dafd41b znc-0.093.svn2098.tar.bz2 +c3a67b46669774cf02c31156f03c4643 znc-0.093.svn2101.tar.bz2 diff --git a/znc.spec b/znc.spec index 2429a9e..d075c6c 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.093 -Release: 1.svn2098%{?dist} +Release: 2.svn2101%{?dist} #Release: 0.1.rc1%{?dist} #Release: 1%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.093.svn2098.tar.bz2 -# svn export https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.093.svn2098 -# tar jcvf znc-0.093.svn2098.tar.bz2 znc-0.093.svn2098/ +Source0: znc-0.093.svn2101.tar.bz2 +# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.093.svn2101 +# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/ #Patch0: znc-trafficstats.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -135,6 +135,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/shell.so %changelog +* Tue Aug 10 2010 Nick Bebout - 0.093-2.svn2101 +- Update to znc 0.093.svn2101 to fix CVE-2010-2812 and CVE-2010-2934 + * Tue Aug 3 2010 Nick Bebout - 0.093-1.svn2098 - Update to znc 0.093 svn2098 From f95c44a291aaf7326d08a5d2b22309e0a415f022 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 10 Aug 2010 20:15:01 -0400 Subject: [PATCH 34/34] Fix build error --- znc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index d075c6c..7725f4b 100644 --- a/znc.spec +++ b/znc.spec @@ -45,7 +45,7 @@ Requires: %{name} = %{version}-%{release} Extra modules for ZNC %prep -%setup -q -n znc-0.093.svn2098 +%setup -q -n znc-0.093.svn2101 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp