From 5faa94e8f3ed4362d2248f5a357bd16ba6cb4bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Sun, 16 Sep 2012 17:12:56 +0200 Subject: [PATCH 1/9] New upstream release. Also: * use system PHPMailer * requires needed php extensions --- .gitignore | 30 +------------------------ sources | 2 +- wordpress.spec | 61 ++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 54 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index f4e7ed0..4f114c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1 @@ -wordpress-3.0.1.tar.gz -/wordpress-3.0.2.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.tar.gz diff --git a/sources b/sources index 4697198..3744939 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfc56cee27eec8fb79070f033ecd4b25 wordpress-3.4.2.tar.gz +105b5baff67344528bb5d8b71c050b0d wordpress-3.5.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 414d616..c17dc8c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,15 +1,16 @@ %global wp_content %{_datadir}/wordpress/wp-content -#%#global betatag -RC3 +%global betatag RC3 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.4.2 +Version: 3.5 Group: Applications/Publishing -#Release: 0.2.%{betatag}%{?dist} -Release: 2%{?dist} +#Release: 0.5.%{betatag}%{?dist} +Release: 1%{?dist} License: GPLv2 -Source0: http://wordpress.org/%{name}-%{version}%{?betatag}.tar.gz +#Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz +Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu @@ -19,7 +20,41 @@ Patch0: wordpress-debian_patches_hello.patch # Move wp-content to /var/www/wordpress/ Patch1: wordpress-move-wp-content.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 5.2.4, webserver, php-mysql, php-gettext, php-simplepie +%if 0%{?rhel} == 5 +Requires: php53 >= 5.2.4, php53-simplepie +%else +Requires: php >= 5.2.4, php-simplepie +%endif +# Required php extension (detected by phpci) +Requires: php-curl +Requires: php-date +Requires: php-dom +Requires: php-enchant +# not yet available for RHEL Requires: php-ereg +Requires: php-exif +Requires: php-fileinfo +# not yet available for RHEL Requires: php-filter +Requires: php-gettext +Requires: php-hash +Requires: php-iconv +Requires: php-json +Requires: php-libxml +Requires: php-mbstring +Requires: php-mysql +Requires: php-openssl +Requires: php-pcre +Requires: php-pdo +Requires: php-posix +Requires: php-reflection +Requires: php-simplexml +Requires: php-sockets +Requires: php-spl +Requires: php-tokenizer +Requires: php-zip +Requires: php-zlib +# Unbundled libraries +Requires: php-PHPMailer +Requires: webserver Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 BuildArch: noarch @@ -65,13 +100,14 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \; # These are docs, remove them from here, docify them later rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} -# Remove bundled php-gettext and link to system copy -rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/gettext.php - # Remove bundled php-simplepie and link to system copy rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php ln -sf /usr/share/php/php-simplepie/simplepie.inc ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php +# Remove bundled PHPMailer and link to system one +rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-{phpmailer,smtp,pop3}.php +ln -sf /usr/share/php/PHPMailer/*php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ + # Remove backup copies of patches find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \ -print -delete @@ -117,6 +153,13 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Dec 12 2012 Matěj Cepl - 3.5-1 +- New upstream release. + +* Mon Oct 29 2012 Remi Collet - 3.5-0.3.beta2 +- use system PHPMailer +- requires needed php extensions + * Thu Sep 06 2012 Matej Cepl - 3.4.2-2 - Upstream security update. From 4c005057881d2be23fff27817c604ccfea735f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Wed, 12 Dec 2012 14:11:14 +0100 Subject: [PATCH 2/9] Add a comment explainin patch1 non-inclusion. --- wordpress.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wordpress.spec b/wordpress.spec index c17dc8c..5750940 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,6 +18,7 @@ Source3: README.fedora.wordpress-mu # (and replace it with Free Software Song) Patch0: wordpress-debian_patches_hello.patch # Move wp-content to /var/www/wordpress/ +# This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?rhel} == 5 From bb272c60b68b9e889b361b1ad0ea555b4c62d7c5 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 18 Dec 2012 20:25:12 -0600 Subject: [PATCH 3/9] Merge --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4d66b47..a7c0e8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= wordpress-3.0.1.tar.gz /wordpress-3.0.2.tar.gz /wordpress-3.0.3.tar.gz @@ -35,5 +33,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.5-RC1.tar.gz /wordpress-3.5-RC2.tar.gz /wordpress-3.5-RC3.tar.gz ->>>>>>> master /wordpress-3.5.tar.gz From 90015cc4e2750786158a5f8fe827e8e7d8b06f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Fri, 28 Dec 2012 09:57:12 +0100 Subject: [PATCH 4/9] Remove merge marker --- wordpress.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 86d5949..6a69032 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -191,7 +191,6 @@ rm -rf ${RPM_BUILD_ROOT} - New upstream beta1 version - Don’t even bother with removing gettext.php ... it is not used anymore ->>>>>>> master * Thu Sep 06 2012 Matej Cepl - 3.4.2-2 - Upstream security update. From adaf81ee88d406f6bcd3ba3fc95710e328071d7e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Jan 2013 14:20:59 +0100 Subject: [PATCH 5/9] fix merge issue --- wordpress.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index add01e6..96de685 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -119,10 +119,6 @@ for fic in phpmailer smtp pop3; do ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php done -# Remove bundled PHPMailer and link to system one -rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-{phpmailer,smtp,pop3}.php -ln -sf /usr/share/php/PHPMailer/*php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ - # Remove backup copies of patches find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \ -print -delete From 79c1bf8ea5c3090dec3c13f1f078820724e1be16 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Feb 2013 12:04:03 +0100 Subject: [PATCH 6/9] provides POP3 class #905867 --- wordpress.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 96de685..a4e2624 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ Name: wordpress Version: 3.5.1 Group: Applications/Publishing #Release: 0.5.%{betatag}%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 #Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -24,7 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if 0%{?rhel} == 5 -Requires: php53 >= 5.2.4, php53-simplepie +Requires: php53 >= 5.2.4 +Requires: php53-simplepie >= 1.3.1 %else Requires: php >= 5.2.4 Requires: php-simplepie >= 1.3.1 @@ -109,11 +110,16 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} # Remove bundled php-simplepie and link to system copy rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php rm -rf ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie +%if 0%{?rhel} == 5 +ln -sf /usr/share/php/php53-simplepie/autoloader.php \ +%else ln -sf /usr/share/php/php-simplepie/autoloader.php \ +%endif ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php # Remove bundled PHPMailer and link to system one -for fic in phpmailer smtp pop3; do +# Note POP3 is not from PHPMailer but from SquirrelMail +for fic in phpmailer smtp; do rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php ln -sf /usr/share/php/PHPMailer/class.$fic.php \ ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php @@ -164,6 +170,11 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Feb 12 2013 Remi Collet - 3.5.1-2 +- provides POP3 class #905867 + POP3 is not from PHPMailer, but from SquirrelMail +- fix simplepie links (for all branches) + * Wed Jan 30 2013 Remi Collet - 3.5.1-1 - version 3.5.1, various bug and security fixes: CVE-2013-0235, CVE-2013-0236 and CVE-2013-0237 From 15f1484d5bb9fcb18af385e4074e68854d39d924 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Jun 2013 09:17:35 +0200 Subject: [PATCH 7/9] version 3.5.1, various bug and security fixes: CVE-2013-2173 CVE-2013-2199 CVE-2013-2200 CVE-2013-2201 CVE-2013-2202 CVE-2013-2203 CVE-2013-2204 --- .gitignore | 3 +++ sources | 2 +- wordpress.spec | 11 ++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a3311bf..0569754 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +*spec +clog wordpress-3.0.1.tar.gz /wordpress-3.0.2.tar.gz /wordpress-3.0.3.tar.gz @@ -35,3 +37,4 @@ wordpress-3.0.1.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 diff --git a/sources b/sources index 301c035..60120d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -409889c98b13cbdbb9fd121df859ae3e wordpress-3.5.1.tar.gz +90acae65199db7b33084ef36860d7f22 wordpress-3.5.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index a4e2624..9e4a6af 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -4,10 +4,10 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.5.1 +Version: 3.5.2 Group: Applications/Publishing #Release: 0.5.%{betatag}%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 #Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -170,6 +170,11 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Mon Jun 24 2013 Remi Collet - 3.5.2-1 +- version 3.5.1, various bug and security fixes: + CVE-2013-2173 CVE-2013-2199 CVE-2013-2200 CVE-2013-2201 + CVE-2013-2202 CVE-2013-2203 CVE-2013-2204 + * Tue Feb 12 2013 Remi Collet - 3.5.1-2 - provides POP3 class #905867 POP3 is not from PHPMailer, but from SquirrelMail @@ -182,7 +187,7 @@ rm -rf ${RPM_BUILD_ROOT} upstream archive content change - protect akismet content (from upstream .htaccess) -* Mon Jan 2 2013 Remi Collet - 3.5-3 +* Wed Jan 2 2013 Remi Collet - 3.5-3 - fix links to system PHPMailer library * Sun Dec 16 2012 Remi Collet - 3.5-2 From 7e0358bb0afe28ca8f6242b425949dede8a20a73 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Jun 2013 09:24:31 +0200 Subject: [PATCH 8/9] fix ignore list --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0569754..0848b5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*spec +*spec~ clog wordpress-3.0.1.tar.gz /wordpress-3.0.2.tar.gz From c782cc15c3330c713bb2eecd11913e2387bc5088 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Jun 2013 09:26:49 +0200 Subject: [PATCH 9/9] monday's typo --- wordpress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 9e4a6af..cae7b40 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -171,7 +171,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * Mon Jun 24 2013 Remi Collet - 3.5.2-1 -- version 3.5.1, various bug and security fixes: +- version 3.5.2, various bug and security fixes: CVE-2013-2173 CVE-2013-2199 CVE-2013-2200 CVE-2013-2201 CVE-2013-2202 CVE-2013-2203 CVE-2013-2204