From cf08664c67d415a50284a9bb0a8654128d7e71fa Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 3 Jan 2011 11:42:06 -0600 Subject: [PATCH 1/4] Security fixes. --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9857820..87a2493 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ wordpress-2.8.6.tar.gz wordpress-3.0.1.tar.gz /wordpress-3.0.2.tar.gz /wordpress-3.0.3.tar.gz +/wordpress-3.0.4.tar.gz diff --git a/sources b/sources index 92593f6..7eb8c0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9f2c1db36a78d62596bc97d90bf00ae wordpress-3.0.3.tar.gz +a455e0834eb2c8994c35acf3c13ddc11 wordpress-3.0.4.tar.gz diff --git a/wordpress.spec b/wordpress.spec index d2bc33f..cb4ad06 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 3.0.3 +Version: 3.0.4 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -95,6 +95,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog +* Mon Jan 03 2011 Jon Ciesla - 3.0.4-1 +- 3.0.4. Security fixes, BZ 666782. + * Thu Dec 23 2010 Jon Ciesla - 3.0.3-2 - Change Requires from httpd to webserver, BZ 523480. - Patch for Hello Dolly lyrics, BZ 663966. From 32761c88fe9be5f2afb9106d6f2bc302d257efc9 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 3 Jan 2011 12:40:08 -0600 Subject: [PATCH 2/4] Obsoletes -mu, new README. --- README.fedora.wordpress-mu | 5 +++++ wordpress.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 README.fedora.wordpress-mu diff --git a/README.fedora.wordpress-mu b/README.fedora.wordpress-mu new file mode 100644 index 0000000..af10453 --- /dev/null +++ b/README.fedora.wordpress-mu @@ -0,0 +1,5 @@ +As of wordpress 3.0.x, upstream has deprecated wordpress-mu. This +functionality has been included in mainline wordpress. For +information on migrating from wordpress-mu, visit +http://codex.wordpress.org/Migrating_Multiple_Blogs_into_WordPress_3.0_Multisite + diff --git a/wordpress.spec b/wordpress.spec index cb4ad06..ef8864a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,14 +3,16 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.0.4 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress +Source3: README.fedora.wordpress-mu Patch0: wordpress-debian_patches_hello.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php >= 4.1.0, webserver, php-mysql, php-gettext, php-simplepie +Obsoletes: wordpress-mu BuildArch: noarch %description @@ -41,6 +43,7 @@ cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php /bin/ln -sf ../../../etc/wordpress/wp-config.php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-config.php /bin/cp %{SOURCE2} ./README.fedora +/bin/cp %{SOURCE3} ./README.fedora-multiuser # Remove empty files to make rpmlint happy find ${RPM_BUILD_ROOT} -type f -empty -exec rm -f {} \; # These are docs, remove them from here, docify them later @@ -68,6 +71,7 @@ rm -rf ${RPM_BUILD_ROOT} %doc license.txt %doc readme.html %doc README.fedora +%doc README.fedora-multiuser %{_datadir}/wordpress/wp-atom.php %{_datadir}/wordpress/wp-app.php %{_datadir}/wordpress/wp-blog-header.php @@ -95,6 +99,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog +* Mon Jan 03 2011 Jon Ciesla - 3.0.4-2 +- Obsoletes wordpress-mu, deprecated by upstream as of 3.0.x. + * Mon Jan 03 2011 Jon Ciesla - 3.0.4-1 - 3.0.4. Security fixes, BZ 666782. From 15dc12dbe52ebfbf83006da70af8c6f540a974c5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 20:59:47 -0600 Subject: [PATCH 3/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index ef8864a..60ef6ec 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,7 +3,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.0.4 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -99,6 +99,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 03 2011 Jon Ciesla - 3.0.4-2 - Obsoletes wordpress-mu, deprecated by upstream as of 3.0.x. From eb53a6a0aee54e8f6e1355344285fa80fa41d9fb Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 23 Feb 2011 10:15:11 -0600 Subject: [PATCH 4/4] 3.1 --- .gitignore | 1 + sources | 2 +- wordpress-debian_patches_hello.patch | 11 +++++------ wordpress.spec | 7 +++++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 87a2493..3c8687f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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 diff --git a/sources b/sources index 7eb8c0c..5418752 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a455e0834eb2c8994c35acf3c13ddc11 wordpress-3.0.4.tar.gz +b8a701bbcb3fdd5829fec5d90f223b56 wordpress-3.1.tar.gz diff --git a/wordpress-debian_patches_hello.patch b/wordpress-debian_patches_hello.patch index 7e52551..c174426 100644 --- a/wordpress-debian_patches_hello.patch +++ b/wordpress-debian_patches_hello.patch @@ -1,14 +1,13 @@ -Use GPL-compliant lyrics in the hello dolly plugin ---- a/wp-content/plugins/hello.php -+++ b/wp-content/plugins/hello.php +--- wordpress/wp-content/plugins/hello.php~ 2010-11-10 06:43:04.000000000 -0600 ++++ wordpress/wp-content/plugins/hello.php 2011-02-23 10:10:52.152777012 -0600 @@ -6,42 +6,26 @@ /* Plugin Name: Hello Dolly - Plugin URI: http://wordpress.org/# + Plugin URI: http://wordpress.org/extend/plugins/hello-dolly/ -Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page. +Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Richard M. Stallman: Free Software. When activated you will randomly see a lyric from the Free Software Song in the upper right of your admin screen on every page. Author: Matt Mullenweg - Version: 1.5.1 + Version: 1.6 Author URI: http://ma.tt/ */ @@ -57,4 +56,4 @@ Use GPL-compliant lyrics in the hello dolly plugin +You'll be free, hackers, you'll be free."; // Here we split it into lines - $lyrics = explode("\n", $lyrics); + $lyrics = explode( "\n", $lyrics ); diff --git a/wordpress.spec b/wordpress.spec index 60ef6ec..63a07cb 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 3.0.4 +Version: 3.1 Group: Applications/Publishing -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -99,6 +99,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog +* Wed Feb 23 2011 Jon Ciesla - 3.1-1 +- 3.1. + * Mon Feb 07 2011 Fedora Release Engineering - 3.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild