update to 3.7.1 (bugfixes)

(cherry picked from commit 64afcf22fe)

.gitignore

@@ -1,42 +1,4 @@
 *spec~
 clog
-wordpress-3.0.1.tar.gz
+/wordpress-3.7.tar.gz
-/wordpress-3.0.2.tar.gz
+/wordpress-3.7.1.tar.gz
-/wordpress-3.0.3.tar.gz
-/wordpress-3.0.4.tar.gz
-/wordpress-3.1.tar.gz
-/wordpress-3.1.1.tar.gz
-/wordpress-3.1.2.tar.gz
-/wordpress-3.1.3.tar.gz
-/wordpress-3.2-RC1.zip
-/wordpress-3.2-RC3.zip
-/wordpress-3.2.tar.gz
-/wordpress-3.2.1.tar.gz
-/wordpress-3.3-beta2.tar.gz
-/wordpress-3.3-beta3.tar.gz
-/wordpress-3.3-beta4.tar.gz
-/wordpress-3.3-RC1.tar.gz
-/wordpress-3.3-RC2.tar.gz
-/wordpress-3.3.tar.gz
-/wordpress-3.3.1.tar.gz
-/wordpress-3.4-beta1.tar.gz
-/wordpress-3.4-beta2.tar.gz
-/wordpress-3.4-beta3.tar.gz
-/wordpress-3.4-beta4.tar.gz
-/wordpress-3.4-RC1.tar.gz
-/wordpress-3.4-RC2.tar.gz
-/wordpress-3.4-RC3.tar.gz
-/wordpress-3.4.tar.gz
-/wordpress-3.4.1.tar.gz
-/wordpress-3.4.2.tar.gz
-/wordpress-3.5-beta-1.tar.gz
-/wordpress-3.5-beta2.tar.gz
-/wordpress-3.5-beta3.tar.gz
-/wordpress-3.5-RC1.tar.gz
-/wordpress-3.5-RC2.tar.gz
-/wordpress-3.5-RC3.tar.gz
-/wordpress-3.5.tar.gz
-/wordpress-3.5.1.tar.gz
-/wordpress-3.5.2.tar.gz
-/wordpress-3.6.tar.gz
-

sources

@@ -1 +1 @@
-ddbe1549dc27a260d28b47ad32eadd34  wordpress-3.6.tar.gz
+8af9a4885ad134d354eb5f12dcc17fd9  wordpress-3.7.1.tar.gz

wordpress-FSF-address.patch

@@ -1,12 +0,0 @@
-diff -up wordpress/wp-includes/kses.php.FSFaddr wordpress/wp-includes/kses.php
---- wordpress/wp-includes/kses.php.FSFaddr	2011-05-25 23:54:34.347025847 +0200
-+++ wordpress/wp-includes/kses.php	2011-05-25 23:56:18.403727954 +0200
-@@ -15,7 +15,7 @@
-  *
-  * You should have received a copy of the GNU General Public License along
-  * with this program; if not, write to the Free Software Foundation, Inc.,
-- * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  or visit
-+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  * http://www.gnu.org/licenses/gpl.html
-  *
-  * [kses strips evil scripts!]

wordpress.spec

@@ -1,19 +1,24 @@
 %global wp_content %{_datadir}/wordpress/wp-content
-%global betatag RC3
 
-Summary: Blog tool and publishing platform
+%if 0%{?rhel} == 5
-URL: http://www.wordpress.org
+%global with_cacert 0
-Name: wordpress
+%else
-Version: 3.6
+%global with_cacert 1
-Group: Applications/Publishing
+%endif
-#Release: 0.5.%{betatag}%{?dist}
+
-Release: 1%{?dist}
+Summary:    Blog tool and publishing platform
-License: GPLv2
+URL:        http://www.wordpress.org
-#Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz
+Name:       wordpress
-Source0: http://wordpress.org/%{name}-%{version}.tar.gz
+Version:    3.7.1
-Source1: wordpress-httpd-conf
+Group:      Applications/Publishing
-Source2: README.fedora.wordpress
+Release:    1%{?dist}
-Source3: README.fedora.wordpress-mu
+License:    GPLv2
+
+Source0:    http://wordpress.org/%{name}-%{version}.tar.gz
+Source1:    wordpress-httpd-conf
+Source2:    README.fedora.wordpress
+Source3:    README.fedora.wordpress-mu
+
 # Patch out copyrighted text of Hello, Dolly
 # (and replace it with Free Software Song)
 Patch0: wordpress-debian_patches_hello.patch
@@ -41,7 +46,7 @@ Requires: php53-simplepie >= 1.3.1
 Requires: php >= 5.2.4
 Requires: php-simplepie >= 1.3.1
 %endif
-# Required php extension (detected by phpci)
+# Required php extension (detected by phpcompatinfo)
 Requires: php-curl
 Requires: php-date
 Requires: php-dom
@@ -71,6 +76,9 @@ Requires: php-zlib
 # Unbundled libraries
 Requires: php-PHPMailer
 Requires: webserver
+%if %{with_cacert}
+Requires: ca-certificates
+%endif
 Provides: wordpress-mu = %{version}-%{release}
 Obsoletes: wordpress-mu < 2.9.3
 
@@ -160,8 +168,15 @@ for fic in phpmailer smtp; do
          ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
 done
 
+# Remove bundled ca-bundle.crt
+%if %{with_cacert}
+rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt
+ln -s /etc/pki/tls/certs/ca-bundle.crt \
+   ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt
+%endif
+
 # Remove backup copies of patches
-find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \
+find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig \) \
     -print -delete
 
 ## Move wp-content directory to /var/www location
@@ -205,6 +220,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Oct 30 2013 Remi Collet <rcollet@redhat.com> - 3.7.1-1
+- update to 3.7.1 (bugfixes)
+
+* Fri Oct 25 2013 Remi Collet <rcollet@redhat.com> - 3.7-1
+- update to 3.7
+- requires ca-certificates for ca-bundle.crt
+
+* Thu Sep 12 2013 Paul Wouters <pwouters@redhat.com> - 3.6.1-1
+- update to 3.6.1, various bugs and security fixes:
+  CVE-2013-4338 CVE-2013-4339 CVE-2013-4340
+
 * Thu Aug 22 2013 Adam Williamson <awilliam@redhat.com> - 3.6.0-1
 - update to 3.6.0
 - drop pre-compiled Flash and Silverlight binaries - #1000267