[check-mk/f19: 2/2] Merge branch 'master' into f19

[averi]

commit 4094396d0442c2c3a06a8277de5a5edcedbc329d
Merge: 3adf776 5ec4923
Author: Andrea Veri <av at gnome.org>
Date:   Wed Apr 2 17:59:36 2014 +0200

    Merge branch 'master' into f19

 .gitignore             |    1 +
 First-Installation.txt |    8 ++++++++
 check-mk.spec          |   19 ++++++++++++++-----
 defaults               |    2 +-
 defaults.py            |    2 +-
 sources                |    2 +-
 6 files changed, 26 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 95ae274,cb7e293..3639478
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,2 @@@
 -/check_mk-1.2.2.tar.gz
 -/check_mk-1.2.2p2.tar.gz
  /check_mk-1.2.4.tar.gz
+ /check_mk-1.2.4p1.tar.gz
diff --cc check-mk.spec
index bf7b40b,e7534c1..202bf8e
--- a/check-mk.spec
+++ b/check-mk.spec
@@@ -244,7 -249,14 +249,13 @@@ rmdir %{buildroot}%{_prefix}/lib/check_
  %{_bindir}/unixcat
  %{_libdir}/check_mk
  
 -
  %changelog
+ * Wed Apr 02 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p1-1
+ - New upstream release. Fixes the missing two CVEs that were still
+   left unfixed on 1.2.4:
+   - CVE-2014-2330
+   - CVE-2014-2331
+ 
  * Tue Mar 25 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4-1
  - New upstream release. Fixes the following CVEs:
    - CVE-2014-2329