From 04f7e0dec9732c51e2c2f8a95d52bcf6b38b7cbc Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 11 Aug 2010 11:31:14 -0500 Subject: [PATCH 01/10] 3.0.1. --- .gitignore | 1 + sources | 2 +- wordpress.spec | 23 ++++++++++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d36dfea..f211ebf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wordpress-2.8.6.tar.gz +wordpress-3.0.1.tar.gz diff --git a/sources b/sources index 4e01de6..cb3dbb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1956f09f2abe74ed85e0de04d511d433 wordpress-2.8.6.tar.gz +8fa5373ed805fb9a6ee56dfd236dcb64 wordpress-3.0.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 31788b0..96117de 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,15 +1,15 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.8.6 +Version: 3.0.1 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.1.0, httpd, php-mysql +Requires: php >= 4.1.0, httpd, php-mysql, php-gettext, php-simplepie BuildArch: noarch %description @@ -42,6 +42,14 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -f {} \; # 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 +ln -sf /usr/share/php/php-gettext/gettext.php ${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 + %clean rm -rf ${RPM_BUILD_ROOT} @@ -79,8 +87,17 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-trackback.php %{_datadir}/wordpress/xmlrpc.php %dir %{_sysconfdir}/wordpress +%{_datadir}/wordpress/wp-activate.php +%{_datadir}/wordpress/wp-signup.php %changelog +* Mon Aug 09 2010 Jon Ciesla - 3.0.1-1 +- 3.0.1. + +* Mon Jul 12 2010 Jon Ciesla - 2.8.6-3 +- Remove bundled php-gettext and php-simplepie, +- require and link to system versions, BZ 544720. + * Mon Nov 16 2009 Adrian Reber - 2.8.6-2 - updated to 2.8.6 (Security Release) From c47b21a6d490bb238f9b2fa26734ae1294a64543 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 10 Dec 2010 10:05:21 -0600 Subject: [PATCH 02/10] 3.0.2, multiple security fixes. --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f211ebf..682c55d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ wordpress-2.8.6.tar.gz wordpress-3.0.1.tar.gz +/wordpress-3.0.2.tar.gz diff --git a/sources b/sources index cb3dbb9..8434e8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fa5373ed805fb9a6ee56dfd236dcb64 wordpress-3.0.1.tar.gz +9f8b305f72dbe96291ca0d13b21cb279 wordpress-3.0.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 96117de..cfbe885 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 3.0.1 +Version: 3.0.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -91,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog +* Fri Dec 10 2010 Jon Ciesla - 3.0.2-1 +- 3.0.2. Security fixes, BZ 659319. + * Mon Aug 09 2010 Jon Ciesla - 3.0.1-1 - 3.0.1. From aa3dd935f8c86c41c3f417d7b74d08e411061fa6 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 10 Dec 2010 12:52:21 -0600 Subject: [PATCH 03/10] 3.0.3 --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 682c55d..9857820 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,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 diff --git a/sources b/sources index 8434e8c..92593f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f8b305f72dbe96291ca0d13b21cb279 wordpress-3.0.2.tar.gz +c9f2c1db36a78d62596bc97d90bf00ae wordpress-3.0.3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index cfbe885..fc97993 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 3.0.2 +Version: 3.0.3 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -91,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog +* Fri Dec 10 2010 Jon Ciesla - 3.0.3-1 +- 3.0.3. Security fixes, BZ 659319. + * Fri Dec 10 2010 Jon Ciesla - 3.0.2-1 - 3.0.2. Security fixes, BZ 659319. From b11dfd978ab27003cb00857c3086b993b7bfdae3 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 23 Dec 2010 08:45:42 -0600 Subject: [PATCH 04/10] Two fixes. --- wordpress-debian_patches_hello.patch | 60 ++++++++++++++++++++++++++++ wordpress.spec | 12 +++++- 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 wordpress-debian_patches_hello.patch diff --git a/wordpress-debian_patches_hello.patch b/wordpress-debian_patches_hello.patch new file mode 100644 index 0000000..7e52551 --- /dev/null +++ b/wordpress-debian_patches_hello.patch @@ -0,0 +1,60 @@ +Use GPL-compliant lyrics in the hello dolly plugin +--- a/wp-content/plugins/hello.php ++++ b/wp-content/plugins/hello.php +@@ -6,42 +6,26 @@ + /* + Plugin Name: Hello Dolly + Plugin URI: http://wordpress.org/# +-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 + Author URI: http://ma.tt/ + */ + + function hello_dolly_get_lyric() { +- /** These are the lyrics to Hello Dolly */ +- $lyrics = "Hello, Dolly +-Well, hello, Dolly +-It's so nice to have you back where you belong +-You're lookin' swell, Dolly +-I can tell, Dolly +-You're still glowin', you're still crowin' +-You're still goin' strong +-We feel the room swayin' +-While the band's playin' +-One of your old favourite songs from way back when +-So, take her wrap, fellas +-Find her an empty lap, fellas +-Dolly'll never go away again +-Hello, Dolly +-Well, hello, Dolly +-It's so nice to have you back where you belong +-You're lookin' swell, Dolly +-I can tell, Dolly +-You're still glowin', you're still crowin' +-You're still goin' strong +-We feel the room swayin' +-While the band's playin' +-One of your old favourite songs from way back when +-Golly, gee, fellas +-Find her a vacant knee, fellas +-Dolly'll never go away +-Dolly'll never go away +-Dolly'll never go away again"; ++ // These are the lyrics to the Free Software Song ++$lyrics = "Join us now and share the software; ++You'll be free, hackers, you'll be free. ++Hoarders may get piles of money, ++That is true, hackers, that is true. ++But they cannot help their neighbors; ++That ain't good, hackers, that ain't good. ++When we have enough free software ++At our call, hackers, at our call, ++We'll kick out those dirty licenses ++Ever more, hackers, ever more. ++Join us now and share the software; ++You'll be free, hackers, you'll be free."; + + // Here we split it into lines + $lyrics = explode("\n", $lyrics); diff --git a/wordpress.spec b/wordpress.spec index fc97993..d2bc33f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,13 +3,14 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.0.3 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 +Patch0: wordpress-debian_patches_hello.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.1.0, httpd, php-mysql, php-gettext, php-simplepie +Requires: php >= 4.1.0, webserver, php-mysql, php-gettext, php-simplepie BuildArch: noarch %description @@ -18,6 +19,9 @@ almost trivial, to get information out to people on the web. %prep %setup -q -n wordpress + +%patch0 -p1 -b .dolly + # disable wp_version_check, updates are always installed via rpm sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \ wp-includes/update.php @@ -91,6 +95,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog +* 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. + * Fri Dec 10 2010 Jon Ciesla - 3.0.3-1 - 3.0.3. Security fixes, BZ 659319. From cf08664c67d415a50284a9bb0a8654128d7e71fa Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 3 Jan 2011 11:42:06 -0600 Subject: [PATCH 05/10] 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 06/10] 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 07/10] - 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 08/10] 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 From 8c600ef208f28a47c96b14eb1fd1f0b1d995b511 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 21 Mar 2011 09:25:14 -0500 Subject: [PATCH 09/10] Spec error. --- wordpress.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 710c531..454a02f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -99,15 +99,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/wp-signup.php %changelog -<<<<<<< HEAD -* Mon Jan 03 2011 Jon Ciesla - 2.8.6-4 -- Patch for security vulnerability, BZ 666782. - -* Thu Dec 23 2010 Jon Ciesla - 2.8.6-3 -- Change Requires from httpd to webserver, BZ 523480. -- Patch for Hello Dolly lyrics, BZ 663966. -- Patch for security vulnerability, BZ 659319. - * Wed Feb 23 2011 Jon Ciesla - 3.1-1 - 3.1. From ea38f9f434aa527fbc56308ae161961d823e3395 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 21 Mar 2011 09:26:48 -0500 Subject: [PATCH 10/10] Spec error. --- wordpress.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 454a02f..63a07cb 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -124,14 +124,6 @@ rm -rf ${RPM_BUILD_ROOT} * Mon Aug 09 2010 Jon Ciesla - 3.0.1-1 - 3.0.1. -* Mon Jan 03 2011 Jon Ciesla - 2.8.6-4 -- Patch for security vulnerability, BZ 666782. - -* Thu Dec 23 2010 Jon Ciesla - 2.8.6-3 -- Change Requires from httpd to webserver, BZ 523480. -- Patch for Hello Dolly lyrics, BZ 663966. -- Patch for security vulnerability, BZ 659319. - * Mon Jul 12 2010 Jon Ciesla - 2.8.6-3 - Remove bundled php-gettext and php-simplepie, - require and link to system versions, BZ 544720.