[znc/el6: 4/4] Merge branch 'master' into el6

[Nick Bebout]

commit ef67239280d2affda893beeae280e75d0bc91a5c
Merge: 79bc0a8 afe2435
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Jan 23 11:19:34 2012 -0600

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |   13 ++++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --cc znc.spec
index 1fc071a,dcee908..9889c64
--- a/znc.spec
+++ b/znc.spec
@@@ -231,7 -240,19 +231,14 @@@ f
  %{_libdir}/znc/modperl.so
  %{_libdir}/znc/perleval.pm
  
 -%files modpython
 -%defattr(-,root,root)
 -%{_libdir}/znc/modpython/
 -%{_libdir}/znc/modpython.so
 -
  %changelog
+ * Mon Jan 23 2012 Nick Bebout <nb at fedoraproject.org> - 0.204-1
+ - Update to 0.204 to fix security issue CVE-2012-0033
+ 
+ * Mon Jan 09 2012 Nick Bebout <nb at 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 at fedoraproject.org> - 0.202-1
  - Update to 0.202