Merge branch 'master' into el6

Conflicts:
	.gitignore
	sources
	znc.spec

.gitignore

@@ -1 +1 @@
-znc-0.092.tar.gz
+znc-0.093.svn2101.tar.bz2

sources

@@ -1 +1 @@
-e800a70c932dd13bc09b63569b49db3a  znc-0.092.tar.gz
+c3a67b46669774cf02c31156f03c4643  znc-0.093.svn2101.tar.bz2

znc.spec

@@ -1,12 +1,17 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.092
+Version:        0.093
+Release:        2.svn2101%{?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.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
@@ -40,7 +45,7 @@ Requires:      %{name} = %{version}-%{release}
 Extra modules for ZNC
 
 %prep
-%setup -q
+%setup -q -n znc-0.093.svn2101
 %__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,12 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/shell.so
 
 %changelog
+* Tue Aug 10 2010 Nick Bebout <nb@fedoraproject.org> - 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 <nb@fedoraproject.org> - 0.093-1.svn2098
+- Update to znc 0.093 svn2098
+
 * Wed Jul 14 2010 Nick Bebout <nb@fedoraproject.org> - 0.092-1
 - Update to znc 0.092