Merge branch 'master' into el5

.gitignore

@@ -19,3 +19,4 @@
 /znc-0.200-rc1.tar.gz
 /znc-0.200.tar.gz
 /znc-0.202.tar.gz
+/znc-0.204.tar.gz

sources

@@ -1 +1 @@
-3c6ff4620e139e3d9745cd53111bab20  znc-0.202.tar.gz
+7c7247423fc08b0c5c62759a50a9bca3  znc-0.204.tar.gz

znc.spec

@@ -9,14 +9,13 @@
 
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        0.202
+Version:        0.204
 #Release:        0.1.20110801git%{?dist}
 Release:        1%{?dist}
-#Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.in
-Source0:        http://znc.in/releases/znc-0.202.tar.gz
+Source0:        http://znc.in/releases/znc-0.204.tar.gz
 %if %{use_systemd}
 Source1:        znc.service
 %endif
@@ -50,6 +49,7 @@ DCC bouncing, Perl and C++ module support to name a few.
 Summary:        Development files needed to compile ZNC modules
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release} pkgconfig
+Requires:       openssl-devel c-ares-devel glibc-devel
 BuildRequires: pkgconfig
 
 %description devel
@@ -215,6 +215,13 @@ fi
 %{_libdir}/znc/modtcl.so
 
 %changelog
+* Mon Jan 23 2012 Nick Bebout <nb@fedoraproject.org> - 0.204-1
+- Update to 0.204 to fix security issue CVE-2012-0033
+
+* Mon Jan 09 2012 Nick Bebout <nb@fedoraproject.org> - 0.202-2
+- Add glibc-devel, openssl-devel, c-ares-devel to requires for
+- znc-devel so znc-buildmod will work
+
 * Sun Sep 25 2011 Nick Bebout <nb@fedoraproject.org> - 0.202-1
 - Update to 0.202