diff --git a/.gitignore b/.gitignore index a3311bf..0848b5c 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-FSF-address.patch b/wordpress-FSF-address.patch deleted file mode 100644 index 8992779..0000000 --- a/wordpress-FSF-address.patch +++ /dev/null @@ -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!] diff --git a/wordpress.spec b/wordpress.spec index 96de685..570611a 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.5.1 +Version: 3.5.2 Group: Applications/Publishing #Release: 0.5.%{betatag}%{?dist} Release: 1%{?dist} @@ -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,16 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Mon Jun 24 2013 Remi Collet - 3.5.2-1 +- 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 + +* 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 @@ -171,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 @@ -193,10 +209,6 @@ rm -rf ${RPM_BUILD_ROOT} * Tue Nov 13 2012 Matěj Cepl - 3.5-0.4.beta3 - New upstream beta3 version -* Mon Oct 29 2012 Remi Collet - 3.5-0.3.beta2 -- use system PHPMailer -- requires needed php extensions - * Sat Oct 13 2012 Matěj Cepl - 3.5-0.2.beta2 - New upstream beta2 version @@ -219,29 +231,14 @@ rm -rf ${RPM_BUILD_ROOT} * theme customizer * XML-RPC themes and API improvements -* Tue Jun 12 2012 Matej Cepl - 3.4-0.2.RC3 -- They still haven’t released. +* Mon Apr 23 2012 'Matěj Cepl ' - 3.3.2-2 +- Security updates for uploading files. + * 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. -* Thu Jun 07 2012 Matej Cepl - 3.4-0.2.RC2 -- And yet another release candidate. - -* Wed May 30 2012 Matej Cepl - 3.4-0.2.RC1 -- We have a release candidate now. - -* Thu May 03 2012 'Matej Cepl ' - 3.4-0.2.beta4 -- New week, new upstream beta. Less drama than last time. - -* Mon Apr 23 2012 'Matěj Cepl ' - 3.4-0.2.beta3 -- And yet another upstream beta (fixes CVE-2011-0700 and - CVE-2011-0701) - -* Mon Apr 16 2012 Matěj Cepl - 3.4-0.2.beta2 -- And yet another upstream beta - -* Thu Apr 05 2012 'Matej Cepl ' - 3.4-0.1.beta1 -- New upstream beta release (just for Rawhide, to be sure we build) - -* Wed Jan 04 2012 'Matej Cepl ' - 3.3.1-1 +* Wed Jan 04 2012 'Matěj Cepl ' - 3.3.1-1 - Security (XSS) and maintenance upstream release. * Tue Dec 13 2011 'Matěj Cepl ' - 3.3-1 @@ -274,11 +271,8 @@ rm -rf ${RPM_BUILD_ROOT} * Tue Jul 05 2011 Matěj Cepl - 3.2-1 - New upstream release. -* Wed Jun 29 2011 Matěj Cepl - 3.2-0.1.RC3 -- Updated prerelease version (security and minor fixes). - -* Sun Jun 19 2011 Matěj Cepl - 3.2-0.1.RC1 -- Prerelease version. +* Wed Jun 29 2011 Matěj Cepl - 3.1.4-1 +- New upstream security release. * Thu Jun 02 2011 Matěj Cepl - 3.1.3-3 - Actually, we just don't need gettext.php at all, it is provided by