From 7b9b4f88a1a9be2d47ff36bdd1eed51ee8afc6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
Date: Mon, 23 Apr 2012 12:31:57 +0200
Subject: [PATCH 1/2] New upstream release (security release).

---
 .gitignore     | 1 +
 sources        | 2 +-
 wordpress.spec | 9 +++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb6ef41..1417aa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.3-RC2.tar.gz
 /wordpress-3.3.tar.gz
 /wordpress-3.3.1.tar.gz
+/wordpress-3.3.2.tar.gz
diff --git a/sources b/sources
index fb3ad90..1ade4fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e94894be6e6d213175940ccc14e6c5e4  wordpress-3.3.1.tar.gz
+bb38fa2bcde3b144e1a7fb096cd597a1  wordpress-3.3.2.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index a90049c..8ca7d21 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -4,7 +4,7 @@
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.3.1
+Version: 3.3.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -116,7 +116,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
-* Wed Jan 04 2012 'Matej Cepl <mcepl@redhat.com>' - 3.3.1-1
+* Mon Apr 23 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.2-1
+- Security updates for uploading files.
+  (apparently no CVE exists yet;
+  http://seclists.org/oss-sec/2012/q2/164)
+
+* Wed Jan 04 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.1-1
 - Security (XSS) and maintenance upstream release.
 
 * Tue Dec 13 2011 'Matěj Cepl <mcepl@redhat.com>' - 3.3-1

From 2710f1675dd35a7f8e2795cf322b2ddf96ffc011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
Date: Mon, 23 Apr 2012 12:47:45 +0200
Subject: [PATCH 2/2] Fix changelog

---
 wordpress.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wordpress.spec b/wordpress.spec
index 8ca7d21..63c51dd 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -6,7 +6,7 @@ URL: http://www.wordpress.org
 Name: wordpress
 Version: 3.3.2
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -116,10 +116,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
-* Mon Apr 23 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.2-1
+* Mon Apr 23 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.2-2
 - Security updates for uploading files.
-  (apparently no CVE exists yet;
-  http://seclists.org/oss-sec/2012/q2/164)
+  * Fixed CVE-2011-0700: two XSS bug. Affects users of the Author
+    or Contributor role.
+  * Fixed CVE-2011-0701: potential information disclosure of
+    posts through the media uploader.
 
 * Wed Jan 04 2012 'Matěj Cepl <mcepl@redhat.com>' - 3.3.1-1
 - Security (XSS) and maintenance upstream release.