dist-git conversion

dereference flaw leads to segfault under certain conditions

.gitignore

@@ -0,0 +1 @@
+znc-0.090.tar.gz

Makefile

@@ -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 $$/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)

sources

@@ -0,0 +1 @@
+d3ffe4f53211e5a425c7b87e9ca41e84  znc-0.090.tar.gz

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();

znc.spec

@@ -0,0 +1,267 @@
+Summary:        An advanced IRC bouncer
+Name:           znc
+Version:        0.090
+#Release:        0.1.rc1%{?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++
+BuildRequires:  openssl-devel >= 0.9.8
+BuildRequires:  cyrus-sasl-devel
+BuildRequires:  c-ares-devel
+BuildRequires:  perl(ExtUtils::Embed)
+
+%description
+ZNC is an IRC bouncer with many advanced features like detaching,
+multiple users, per channel playback buffer, SSL, IPv6, transparent
+DCC bouncing, Perl and C++ module support to name a few.
+
+%package devel
+Summary:        Development files needed to compile ZNC modules
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release} pkgconfig
+BuildRequires: pkgconfig
+
+%description devel
+All includes and program files you need to compile your own znc
+modules.
+
+%package extra
+Summary:       Extra modules for ZNC
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description extra
+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
+
+%build
+%configure \
+     --with-module-prefix=%{_libdir}/znc \
+     --enable-ipv6 --enable-extra --enable-sasl
+%__make %{?_smp_mflags}
+
+%install
+%__rm -Rf "%{buildroot}"
+%__make install DESTDIR="%{buildroot}"
+
+%clean
+%__rm -Rf "%{buildroot}"
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS LICENSE LICENSE.OpenSSL README
+%{_bindir}/znc
+%{_mandir}/man1/*
+%{_libdir}/znc/admin.so
+%{_libdir}/znc/adminlog.so
+%{_libdir}/znc/autoattach.so
+%{_libdir}/znc/autocycle.so
+%{_libdir}/znc/autoop.so
+%{_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/disconkick.so
+%{_libdir}/znc/fail2ban.so
+%{_libdir}/znc/fixfreenode.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
+%{_libdir}/znc/notes.so
+%{_libdir}/znc/partyline.so
+%{_libdir}/znc/perform.so
+%{_libdir}/znc/q.so
+%{_libdir}/znc/raw.so
+%{_libdir}/znc/route_replies.so
+%{_libdir}/znc/sample.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
+%{_libdir}/znc/webadmin.so
+%{_datadir}/znc/
+
+%files devel
+%defattr(-,root,root)
+%{_bindir}/znc-buildmod
+%{_bindir}/znc-config
+%{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/znc/
+
+%files extra
+%defattr(-,root,root)
+%{_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
+%{_libdir}/znc/fakeonline.so
+%{_libdir}/znc/flooddetach.so
+%{_libdir}/znc/imapauth.so
+%{_libdir}/znc/listsockets.so
+%{_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
+* Wed Jun 16 2010 Nick Bebout <nb@fedoraproject.org> - 0.090-2
+- 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 <nb@fedoraproject.org> - 0.090-1
+- Update to znc 0.090
+
+* Thu May 27 2010 Nick Bebout <nb@fedoraproject.org> - 0.090-0.1.rc1
+- Update to znc 0.090-rc1
+
+* Thu May 27 2010 Nick Bebout <nb@fedoraproject.org> - 0.089-7.svn2004
+- Update to znc 0.089.svn2004
+
+* Tue May 18 2010 Nick Bebout <nb@fedoraproject.org> - 0.089-6.svn2000
+- Re-enable saslauth
+
+* Tue May 18 2010 Nick Bebout <nb@fedoraproject.org> - 0.089-5.svn2000
+- Re-enable modperl
+
+* Tue May 18 2010 Nick Bebout <nb@fedoraproject.org> - 0.089-4.svn2000
+- Update to znc 0.089.svn2000
+
+* Sun Apr 25 2010 Nick Bebout <nb@fedoraproject.org> - 0.089-3.svn1944
+- Update to znc 0.089.svn1944
+
+* Wed Apr 7 2010 Nick Bebout <nb@fedoraproject.org> - 0.081-2.svn1897
+- Update to znc 0.081.svn1897
+
+* Mon Mar 29 2010 Nick Bebout <nb@fedoraproject.org> - 0.081-1.svn1850
+- Update to znc 0.081.svn1850
+
+* Thu Feb 18 2010 Nick Bebout <nb@fedoraproject.org> - 0.080-1
+- Update to znc 0.080
+
+* Wed Dec 30 2009 Nick Bebout <nb@fedoraproject.org> - 0.078-1
+- Update to znc 0.078
+
+* Sun Dec 13 2009 Nick Bebout <nb@fedoraproject.org> - 0.078-0.1.rc1
+- Update to znc 0.078.rc1
+
+* Mon Dec 7 2009 Nick Bebout <nb@fedoraproject.org> - 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 <skasal@redhat.com> - 0.076-3
+- rebuild against perl 5.10.1
+
+* Fri Sep 25 2009 Nick Bebout <nb@fedoraproject.org> - 0.076-2
+- Fix missing dist tag
+
+* Fri Sep 25 2009 Nick Bebout <nb@fedoraproject.org> - 0.076-1
+- Upgrade to ZNC 0.076
+- http://en.znc.in/wiki/ChangeLog/0.076
+
+* Fri Aug 28 2009 Nick Bebout <nb@fedoraproject.org> - 0.075-8.svn1613
+- Rebuild with new openssl and svn 1613
+- build 0.075-7.svn1610 existed but I had to remove it from the spec because
+- the date was earlier than the date tmraz build the new openssl one
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz@redhat.com> - 0.075-6.svn1608
+- rebuilt with new openssl
+
+* Thu Aug 20 2009 Nick Bebout <nb@fedoraproject.org> - 0.075-5.svn1608
+- Upgrade to svn 1608
+
+* Tue Aug 18 2009 Nick Bebout <nb@fedoraproject.org> - 0.075-4.20090818svn1602
+- Upgrade to svn 1602
+
+* Sat Aug 8 2009 Nick Bebout <nb@fedoraproject.org> - 0.075-3.20090807svn1594
+- Fix source filename
+
+* Fri Aug 7 2009 Nick Bebout <nb@fedoraproject.org> - 0.075-2.20090807svn1594
+- Fix broken source tarball
+
+* Fri Aug 7 2009 Nick Bebout <nb@fedoraproject.org> - 0.075-1.20090807svn1594
+- Upgrade to svn 1594
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.074-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 23 2009 Nick Bebout <nb@fedoraproject.org> - 0.074-1
+- Update to 0.074
+
+* Wed Jul 22 2009 Nick Bebout <nb@fedoraproject.org> - 0.072-3
+- Fix date in changelog, disable c-ares
+
+* Wed Jul 22 2009 Nick Bebout <nb@fedoraproject.org> - 0.072-2
+- Backport patch to fix webadmin skins issue introduced in 0.072
+
+* Wed Jul 22 2009 Nick Bebout <nb@fedoraproject.org> - 0.072-1
+- Upgrade to 0.072 of ZNC, fixes security issue in bug # 513152
+
+* Sun Jul 12 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-7
+- Fix License: to be GPLv2 with exceptions
+
+* Sat Jul 11 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-6
+- Fix permissions error in %%prep, not in source
+
+* Sat Jul 11 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-5
+- Fix permissions error on q.cpp and add LICENSE.OpenSSL
+
+* Sat Jul 11 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-4
+- Remove switch to enable debug, fix %%files section
+
+* Fri Jul 10 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-3
+- Move fixfreenode and log into separate znc-extra package
+- Move awayping into separate znc-awayping package
+
+* Thu Jul 9 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-2
+- Include modules with main package
+
+* Wed Jul 8 2009 Nick Bebout <nb@fedoraproject.org> - 0.070-1
+- Initial Fedora package based on 0.070 of upstream