Merge branch 'master' into el4

Conflicts:
	znc.spec

znc-0.075-openssl.patch

@@ -0,0 +1,15 @@
+diff -up znc-0.075/Csocket.h.openssl znc-0.075/Csocket.h
+--- znc-0.075/Csocket.h.openssl	2009-06-30 11:56:01.000000000 +0200
++++ znc-0.075/Csocket.h	2009-08-26 17:29:37.000000000 +0200
+@@ -990,7 +990,11 @@ private:
+ 	CS_STRING			m_sSSLBuffer;
+ 	SSL 				*m_ssl;
+ 	SSL_CTX				*m_ssl_ctx;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD		*m_ssl_method;
++#else
+ 	SSL_METHOD			*m_ssl_method;
++#endif
+ 	unsigned int		m_iRequireClientCertFlags;
+ 
+ 	FPCertVerifyCB		m_pCerVerifyCB;

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

@@ -30,11 +30,11 @@ Source1:	znc.init
 # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  perl gcc-c++
-BuildRequires:  openssl-devel >= 0.9.8
+BuildRequires:  gcc-c++ perl
+#BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  cyrus-sasl-devel
-BuildRequires:  c-ares-devel automake python3-devel
-BuildRequires:  perl(ExtUtils::Embed) swig tcl-devel
+BuildRequires:  c-ares-devel automake
+BuildRequires:  tcl-devel
 %if %{use_systemd}
 BuildRequires: systemd-units
 %endif
@@ -86,25 +86,6 @@ Requires:      tcl
 %description modtcl
 TCL module for ZNC
 
-%package modperl
-Summary:       perl module for ZNC
-Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      perl
-Provides:      perl(ZNC::Module) = %{version}-%{release}
-
-%description modperl
-perl module for ZNC
-
-%package modpython
-Summary:       python3 module for ZNC
-Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      python3
-
-%description modpython
-python3 module for ZNC
-
 %prep
 %setup -q -n %{name}-%{version}
 #%patch0 -p1
@@ -112,10 +93,9 @@ python3 module for ZNC
 chmod -x modules/q.cpp
 
 %build
-./autogen.sh
 %configure \
-     --with-module-prefix=%{_libdir}/znc \
-     --enable-ipv6 --enable-extra --enable-sasl --enable-python --enable-perl --enable-tcl
+     --with-module-prefix=%{_libdir}/znc --disable-ssl \
+     --enable-ipv6 --enable-extra --enable-sasl --disable-perl --enable-tcl
 %__make %{?_smp_mflags}
 
 %pre
@@ -202,16 +182,16 @@ fi
 %{_libdir}/znc/autocycle.so
 %{_libdir}/znc/autoop.so
 %{_libdir}/znc/autoreply.so
-%{_libdir}/znc/away.so
+#%{_libdir}/znc/away.so
 %{_libdir}/znc/awaynick.so
 %{_libdir}/znc/blockuser.so
 %{_libdir}/znc/bouncedcc.so
 %{_libdir}/znc/buffextras.so
-%{_libdir}/znc/cert.so
-%{_libdir}/znc/certauth.so
+#%{_libdir}/znc/cert.so
+#%{_libdir}/znc/certauth.so
 %{_libdir}/znc/chansaver.so
 %{_libdir}/znc/clientnotify.so
-%{_libdir}/znc/crypt.so
+#%{_libdir}/znc/crypt.so
 %{_libdir}/znc/disconkick.so
 %{_libdir}/znc/fail2ban.so
 %{_libdir}/znc/identfile.so
@@ -226,8 +206,8 @@ fi
 %{_libdir}/znc/raw.so
 %{_libdir}/znc/route_replies.so
 %{_libdir}/znc/sample.so
-%{_libdir}/znc/savebuff.so
-%{_libdir}/znc/schat.so
+#%{_libdir}/znc/savebuff.so
+#%{_libdir}/znc/schat.so
 %{_libdir}/znc/send_raw.so
 %{_libdir}/znc/shell.so
 %{_libdir}/znc/simple_away.so
@@ -275,17 +255,6 @@ fi
 %defattr(-,root,root)
 %{_libdir}/znc/modtcl.so
 
-%files modperl
-%defattr(-,root,root)
-%{_libdir}/znc/modperl/
-%{_libdir}/znc/modperl.so
-%{_libdir}/znc/perleval.pm
-
-%files modpython
-%defattr(-,root,root)
-%{_libdir}/znc/modpython/
-%{_libdir}/znc/modpython.so
-
 %changelog
 * Mon Apr 16 2012 Nick Bebout <nb@fedoraproject.org> - 0.206-1
 - Upgrade to 0.206