From 79e19c6ad8553e106c79a202844edb514bb0e1de Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 25 Aug 2008 19:55:19 +0000 Subject: [PATCH 01/25] Initialize branch F-8 for wordpress-mu --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From be6174d3f7807804a914d9e34a43903f6cb966d5 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Wed, 3 Sep 2008 14:32:33 +0000 Subject: [PATCH 02/25] initial cvs import of wordpress-mu package --- .cvsignore | 1 + README.fedora.wordpress-mu | 20 +++++++ import.log | 1 + sources | 1 + wordpress-mu-httpd-conf | 25 ++++++++ wordpress-mu.spec | 116 +++++++++++++++++++++++++++++++++++++ 6 files changed, 164 insertions(+) create mode 100644 README.fedora.wordpress-mu create mode 100644 import.log create mode 100644 wordpress-mu-httpd-conf create mode 100644 wordpress-mu.spec diff --git a/.cvsignore b/.cvsignore index e69de29..8fa7925 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wordpress-mu-2.6.1.tar.gz diff --git a/README.fedora.wordpress-mu b/README.fedora.wordpress-mu new file mode 100644 index 0000000..2fba019 --- /dev/null +++ b/README.fedora.wordpress-mu @@ -0,0 +1,20 @@ +Alias /wordpress-mu /usr/share/wordpress-mu + + + AllowOverride Options + RewriteEngine On + + RewriteBase /wordpress-mu/ + + #uploaded files + RewriteRule ^(.*/)?files/$ index.php [L] + RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] + + RewriteCond %{REQUEST_FILENAME} -f [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule . - [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] + RewriteRule . index.php [L] + + diff --git a/import.log b/import.log new file mode 100644 index 0000000..83b639a --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +wordpress-mu-2_6_1-1_fc8:HEAD:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452323 diff --git a/sources b/sources index e69de29..9c9f4b4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +231c841354005a7efdfbaa0d61fc531b wordpress-mu-2.6.1.tar.gz diff --git a/wordpress-mu-httpd-conf b/wordpress-mu-httpd-conf new file mode 100644 index 0000000..49685e8 --- /dev/null +++ b/wordpress-mu-httpd-conf @@ -0,0 +1,25 @@ +Alias /wordpress-mu /usr/share/wordpress-mu + + + AllowOverride Options + RewriteEngine On + + RewriteBase /wordpress-mu/ + + #uploaded files + RewriteRule ^(.*/)?files/$ index.php [L] + RewriteCond %{REQUEST_URI} !.*wp-content/plugins.* + RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] + + # add a trailing slash to /wp-admin + RewriteCond %{REQUEST_URI} ^.*/wp-admin$ + RewriteRule ^(.+)$ $1/ [R=301,L] + + RewriteCond %{REQUEST_FILENAME} -f [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule . - [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] + RewriteRule . index.php [L] + + diff --git a/wordpress-mu.spec b/wordpress-mu.spec new file mode 100644 index 0000000..f8817db --- /dev/null +++ b/wordpress-mu.spec @@ -0,0 +1,116 @@ +Summary: WordPress-MU multi-user blogging software +URL: http://mu.wordpress.org/latest.tar.gz +Name: wordpress-mu +Version: 2.6.1 +Release: 1%{?dist} +Group: Applications/Publishing +License: GPLv2 +Source0: %{name}-%{version}.tar.gz +Source1: wordpress-mu-httpd-conf +Source2: README.fedora.wordpress-mu +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: php >= 4.1.0, httpd, php-mysql +BuildArch: noarch + +%description +WordPress-MU is a derivative of the WordPress blogging codebase, to allow +one instance to serve multiple users. + +%prep +%setup -q + +# disable-wordpress-core-update, updates are always installed via rpm +# +# the sed script from wordpress.spec doesn't work due to if/else statement in upstream wordpress-mu's update.php +# sed -i -e "s,add_action,#add_action,g" wp-includes/update.php + +echo "" > wp-includes/update.php + +%build + + +%install +rm -rf %{buildroot} + +mkdir -p %{buildroot}%{_datadir}/wordpress-mu +mkdir -p %{buildroot}%{_sysconfdir}/wordpress-mu +install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/wordpress-mu.conf +install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_docdir}/%{name}-%{version}/README.fedora + +cp -pr * %{buildroot}%{_datadir}/wordpress-mu + +# fix weird upstream perms... +chmod 0644 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/css/content.css +chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js +chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/config.php + + +# since we're using /etc/httpd/conf.d, don't do the funky .htaccess stuff +# that the installer wants +echo "# please see /etc/httpd/conf.d/wordpress-mu.conf" > %{buildroot}%{_datadir}/wordpress-mu/htaccess.dist + + +# Remove empty files to make rpmlint happy +find %{buildroot} -empty -exec rm -f {} \; +# These are docs, remove them from here, docify them later +rm -f %{buildroot}%{_datadir}/wordpress-mu/{license.txt,README.txt} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress-mu.conf +%dir %{_datadir}/wordpress-mu +%{_datadir}/wordpress-mu/htaccess.dist +%{_datadir}/wordpress-mu/wp-admin +%{_datadir}/wordpress-mu/wp-content +%{_datadir}/wordpress-mu/wp-includes +%{_datadir}/wordpress-mu/index.php +%doc license.txt +%doc README.txt +%{_datadir}/wordpress-mu/index-install.php +%{_datadir}/wordpress-mu/wp-activate.php +%{_datadir}/wordpress-mu/wp-atom.php +%{_datadir}/wordpress-mu/wp-app.php +%{_datadir}/wordpress-mu/wp-blog-header.php +%{_datadir}/wordpress-mu/wp-comments-post.php +%{_datadir}/wordpress-mu/wp-commentsrss2.php +%{_datadir}/wordpress-mu/wp-config-sample.php +%{_datadir}/wordpress-mu/wp-cron.php +%{_datadir}/wordpress-mu/wp-feed.php +%{_datadir}/wordpress-mu/wp-load.php +%{_datadir}/wordpress-mu/wp-links-opml.php +%{_datadir}/wordpress-mu/wp-login.php +%{_datadir}/wordpress-mu/wp-mail.php +%{_datadir}/wordpress-mu/wp-pass.php +%{_datadir}/wordpress-mu/wp-rdf.php +%{_datadir}/wordpress-mu/wp-rss.php +%{_datadir}/wordpress-mu/wp-rss2.php +%{_datadir}/wordpress-mu/wp-settings.php +%{_datadir}/wordpress-mu/wpmu-settings.php +%{_datadir}/wordpress-mu/wp-signup.php +%{_datadir}/wordpress-mu/wp-trackback.php +%{_datadir}/wordpress-mu/xmlrpc.php +%{_datadir}/wordpress-mu/favicon.ico +%dir %{_sysconfdir}/wordpress-mu + +%changelog +* Wed Sep 3 2008 Bret McMillan - 2.6.1-1 +- update to 2.6.1 + +* Tue Jul 29 2008 Bret McMillan - 2.6-7 +- added build section to the spec file + +* Wed Jul 29 2008 Bret McMillan - 2.6-6 +- rebasing to wpmu 2.6 + +* Fri May 30 2008 Bret McMillan - 1.5.1-2 +- trying to clean up how we're dealing with htaccess.dist + +* Mon May 26 2008 Bret McMillan - 1.5.1-1 +- update to 1.5.1; getting ready for Fedora submission + +* Fri Apr 25 2008 Bret McMillan - 1.3.3-1 +- initial version; copying heuristics from the base fedora wordpress pkg + From a1a3f7a411f404a1e25c748dd5c36d930a483c31 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Wed, 3 Sep 2008 14:35:13 +0000 Subject: [PATCH 03/25] importing wordpress-mu-2.6.1-1 into Fedora 8 --- .cvsignore | 1 + README.fedora.wordpress-mu | 20 +++++++ import.log | 1 + sources | 1 + wordpress-mu-httpd-conf | 25 ++++++++ wordpress-mu.spec | 116 +++++++++++++++++++++++++++++++++++++ 6 files changed, 164 insertions(+) create mode 100644 README.fedora.wordpress-mu create mode 100644 import.log create mode 100644 wordpress-mu-httpd-conf create mode 100644 wordpress-mu.spec diff --git a/.cvsignore b/.cvsignore index e69de29..8fa7925 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wordpress-mu-2.6.1.tar.gz diff --git a/README.fedora.wordpress-mu b/README.fedora.wordpress-mu new file mode 100644 index 0000000..2fba019 --- /dev/null +++ b/README.fedora.wordpress-mu @@ -0,0 +1,20 @@ +Alias /wordpress-mu /usr/share/wordpress-mu + + + AllowOverride Options + RewriteEngine On + + RewriteBase /wordpress-mu/ + + #uploaded files + RewriteRule ^(.*/)?files/$ index.php [L] + RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] + + RewriteCond %{REQUEST_FILENAME} -f [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule . - [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] + RewriteRule . index.php [L] + + diff --git a/import.log b/import.log new file mode 100644 index 0000000..4770952 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +wordpress-mu-2_6_1-1_fc8:F-8:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452479 diff --git a/sources b/sources index e69de29..9c9f4b4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +231c841354005a7efdfbaa0d61fc531b wordpress-mu-2.6.1.tar.gz diff --git a/wordpress-mu-httpd-conf b/wordpress-mu-httpd-conf new file mode 100644 index 0000000..49685e8 --- /dev/null +++ b/wordpress-mu-httpd-conf @@ -0,0 +1,25 @@ +Alias /wordpress-mu /usr/share/wordpress-mu + + + AllowOverride Options + RewriteEngine On + + RewriteBase /wordpress-mu/ + + #uploaded files + RewriteRule ^(.*/)?files/$ index.php [L] + RewriteCond %{REQUEST_URI} !.*wp-content/plugins.* + RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] + + # add a trailing slash to /wp-admin + RewriteCond %{REQUEST_URI} ^.*/wp-admin$ + RewriteRule ^(.+)$ $1/ [R=301,L] + + RewriteCond %{REQUEST_FILENAME} -f [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule . - [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L] + RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] + RewriteRule . index.php [L] + + diff --git a/wordpress-mu.spec b/wordpress-mu.spec new file mode 100644 index 0000000..f8817db --- /dev/null +++ b/wordpress-mu.spec @@ -0,0 +1,116 @@ +Summary: WordPress-MU multi-user blogging software +URL: http://mu.wordpress.org/latest.tar.gz +Name: wordpress-mu +Version: 2.6.1 +Release: 1%{?dist} +Group: Applications/Publishing +License: GPLv2 +Source0: %{name}-%{version}.tar.gz +Source1: wordpress-mu-httpd-conf +Source2: README.fedora.wordpress-mu +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: php >= 4.1.0, httpd, php-mysql +BuildArch: noarch + +%description +WordPress-MU is a derivative of the WordPress blogging codebase, to allow +one instance to serve multiple users. + +%prep +%setup -q + +# disable-wordpress-core-update, updates are always installed via rpm +# +# the sed script from wordpress.spec doesn't work due to if/else statement in upstream wordpress-mu's update.php +# sed -i -e "s,add_action,#add_action,g" wp-includes/update.php + +echo "" > wp-includes/update.php + +%build + + +%install +rm -rf %{buildroot} + +mkdir -p %{buildroot}%{_datadir}/wordpress-mu +mkdir -p %{buildroot}%{_sysconfdir}/wordpress-mu +install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/wordpress-mu.conf +install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_docdir}/%{name}-%{version}/README.fedora + +cp -pr * %{buildroot}%{_datadir}/wordpress-mu + +# fix weird upstream perms... +chmod 0644 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/css/content.css +chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js +chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/config.php + + +# since we're using /etc/httpd/conf.d, don't do the funky .htaccess stuff +# that the installer wants +echo "# please see /etc/httpd/conf.d/wordpress-mu.conf" > %{buildroot}%{_datadir}/wordpress-mu/htaccess.dist + + +# Remove empty files to make rpmlint happy +find %{buildroot} -empty -exec rm -f {} \; +# These are docs, remove them from here, docify them later +rm -f %{buildroot}%{_datadir}/wordpress-mu/{license.txt,README.txt} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress-mu.conf +%dir %{_datadir}/wordpress-mu +%{_datadir}/wordpress-mu/htaccess.dist +%{_datadir}/wordpress-mu/wp-admin +%{_datadir}/wordpress-mu/wp-content +%{_datadir}/wordpress-mu/wp-includes +%{_datadir}/wordpress-mu/index.php +%doc license.txt +%doc README.txt +%{_datadir}/wordpress-mu/index-install.php +%{_datadir}/wordpress-mu/wp-activate.php +%{_datadir}/wordpress-mu/wp-atom.php +%{_datadir}/wordpress-mu/wp-app.php +%{_datadir}/wordpress-mu/wp-blog-header.php +%{_datadir}/wordpress-mu/wp-comments-post.php +%{_datadir}/wordpress-mu/wp-commentsrss2.php +%{_datadir}/wordpress-mu/wp-config-sample.php +%{_datadir}/wordpress-mu/wp-cron.php +%{_datadir}/wordpress-mu/wp-feed.php +%{_datadir}/wordpress-mu/wp-load.php +%{_datadir}/wordpress-mu/wp-links-opml.php +%{_datadir}/wordpress-mu/wp-login.php +%{_datadir}/wordpress-mu/wp-mail.php +%{_datadir}/wordpress-mu/wp-pass.php +%{_datadir}/wordpress-mu/wp-rdf.php +%{_datadir}/wordpress-mu/wp-rss.php +%{_datadir}/wordpress-mu/wp-rss2.php +%{_datadir}/wordpress-mu/wp-settings.php +%{_datadir}/wordpress-mu/wpmu-settings.php +%{_datadir}/wordpress-mu/wp-signup.php +%{_datadir}/wordpress-mu/wp-trackback.php +%{_datadir}/wordpress-mu/xmlrpc.php +%{_datadir}/wordpress-mu/favicon.ico +%dir %{_sysconfdir}/wordpress-mu + +%changelog +* Wed Sep 3 2008 Bret McMillan - 2.6.1-1 +- update to 2.6.1 + +* Tue Jul 29 2008 Bret McMillan - 2.6-7 +- added build section to the spec file + +* Wed Jul 29 2008 Bret McMillan - 2.6-6 +- rebasing to wpmu 2.6 + +* Fri May 30 2008 Bret McMillan - 1.5.1-2 +- trying to clean up how we're dealing with htaccess.dist + +* Mon May 26 2008 Bret McMillan - 1.5.1-1 +- update to 1.5.1; getting ready for Fedora submission + +* Fri Apr 25 2008 Bret McMillan - 1.3.3-1 +- initial version; copying heuristics from the base fedora wordpress pkg + From b881046c5c351b8dde5326d5594d80c202fed4ee Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Mon, 8 Dec 2008 21:45:25 +0000 Subject: [PATCH 04/25] updating to upstream's 2.6.5 tarball --- .cvsignore | 2 +- sources | 2 +- wordpress-mu.spec | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8fa7925..49ef2a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-mu-2.6.1.tar.gz +wordpress-mu-2.6.5.tar.gz diff --git a/sources b/sources index 9c9f4b4..7a97b98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -231c841354005a7efdfbaa0d61fc531b wordpress-mu-2.6.1.tar.gz +bbdf44968b188d7416292a42efc7463c wordpress-mu-2.6.5.tar.gz diff --git a/wordpress-mu.spec b/wordpress-mu.spec index f8817db..13186ef 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,7 +1,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.6.1 +Version: 2.6.5 Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 @@ -54,6 +54,9 @@ echo "# please see /etc/httpd/conf.d/wordpress-mu.conf" > %{buildroot}%{_datadir find %{buildroot} -empty -exec rm -f {} \; # These are docs, remove them from here, docify them later rm -f %{buildroot}%{_datadir}/wordpress-mu/{license.txt,README.txt} +# remove these as well, detritus +rm -f %{buildroot}%{_datadir}/wordpress-mu/{wordpress-mu-httpd-conf,README.fedora} + %clean rm -rf %{buildroot} @@ -96,6 +99,12 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Mon Dec 1 2008 Bret McMillan - 2.6.5-1 +- Update to 2.6.5 +- http://wordpress.org/development/2008/11/wordpress-265/ +- http://ocaoimh.ie/2008/11/25/wordpress-mu-265/ +- Fixes 1 XSS security issue, 3 bugs + * Wed Sep 3 2008 Bret McMillan - 2.6.1-1 - update to 2.6.1 From 0d8c761c40b6f1b427a513ce73d8b7b4529883b4 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Thu, 12 Feb 2009 19:30:57 +0000 Subject: [PATCH 05/25] reving devel to wpmu 2.7 --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 49ef2a7..ca82e68 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-mu-2.6.5.tar.gz +wordpress-mu-2.7.tar.gz diff --git a/sources b/sources index 7a97b98..68fdf49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bbdf44968b188d7416292a42efc7463c wordpress-mu-2.6.5.tar.gz +b7d119c663833a3fe00d30224530447e wordpress-mu-2.7.tar.gz From 567a6af5146ebaf4bba7c4cf8fcf21672ab7dd25 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Thu, 12 Feb 2009 19:34:38 +0000 Subject: [PATCH 06/25] update devel to wpmu 2.7 --- wordpress-mu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress-mu.spec b/wordpress-mu.spec index 13186ef..946a94f 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,7 +1,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.6.5 +Version: 2.7 Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 @@ -99,6 +99,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Thu Feb 12 2009 Bret McMillan - 2.7-1 +- Update to version 2.7 + * Mon Dec 1 2008 Bret McMillan - 2.6.5-1 - Update to 2.6.5 - http://wordpress.org/development/2008/11/wordpress-265/ From 84952f5377ceccfd6b321031e87afb8dc59f813d Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Thu, 12 Feb 2009 19:49:29 +0000 Subject: [PATCH 07/25] use -n with %setup for upstream's tarball --- wordpress-mu.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wordpress-mu.spec b/wordpress-mu.spec index 946a94f..fcf46fc 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -2,7 +2,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu Version: 2.7 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Publishing License: GPLv2 Source0: %{name}-%{version}.tar.gz @@ -17,7 +17,7 @@ WordPress-MU is a derivative of the WordPress blogging codebase, to allow one instance to serve multiple users. %prep -%setup -q +%setup -q -n wordpress-mu # disable-wordpress-core-update, updates are always installed via rpm # @@ -99,6 +99,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Thu Feb 12 2009 Bret McMillan - 2.7-2 +- Alter source so I can still use upstream's tarball + * Thu Feb 12 2009 Bret McMillan - 2.7-1 - Update to version 2.7 From abfdc2cecef8e84ad9f4d17a7b4a3d9c2c9a9b2d Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Thu, 12 Feb 2009 19:58:10 +0000 Subject: [PATCH 08/25] favicon no longer in the tarball --- wordpress-mu.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wordpress-mu.spec b/wordpress-mu.spec index fcf46fc..c90d5a5 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -95,7 +95,6 @@ rm -rf %{buildroot} %{_datadir}/wordpress-mu/wp-signup.php %{_datadir}/wordpress-mu/wp-trackback.php %{_datadir}/wordpress-mu/xmlrpc.php -%{_datadir}/wordpress-mu/favicon.ico %dir %{_sysconfdir}/wordpress-mu %changelog From e19e2d89f6d4876e77274e435793877acbe7bb5c Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Thu, 12 Feb 2009 20:04:56 +0000 Subject: [PATCH 09/25] cleanup the spec file --- wordpress-mu.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wordpress-mu.spec b/wordpress-mu.spec index c90d5a5..0180988 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -2,7 +2,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu Version: 2.7 -Release: 2%{?dist} +Release: 4%{?dist} Group: Applications/Publishing License: GPLv2 Source0: %{name}-%{version}.tar.gz @@ -98,11 +98,10 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog -* Thu Feb 12 2009 Bret McMillan - 2.7-2 -- Alter source so I can still use upstream's tarball - -* Thu Feb 12 2009 Bret McMillan - 2.7-1 +* Thu Feb 12 2009 Bret McMillan - 2.7-4 - Update to version 2.7 +- Alter source prep so I can still use upstream's tarball +- favicon.ico removed from manifest * Mon Dec 1 2008 Bret McMillan - 2.6.5-1 - Update to 2.6.5 From 618c78db521932cdea137446ade47782a4fa536d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 19:01:23 +0000 Subject: [PATCH 10/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- wordpress-mu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress-mu.spec b/wordpress-mu.spec index 0180988..fed14bb 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -2,7 +2,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu Version: 2.7 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Publishing License: GPLv2 Source0: %{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 12 2009 Bret McMillan - 2.7-4 - Update to version 2.7 - Alter source prep so I can still use upstream's tarball From db75b6f5d2acc15b86bb0fc55a58d27325ad4ce7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:22:43 +0000 Subject: [PATCH 11/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- wordpress-mu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress-mu.spec b/wordpress-mu.spec index fed14bb..75f9165 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -2,7 +2,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu Version: 2.7 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/Publishing License: GPLv2 Source0: %{name}-%{version}.tar.gz @@ -98,6 +98,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 2.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 2.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From e70b29de240c3b3b64cb73df94c0c731a657ffcd Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Fri, 31 Jul 2009 17:53:16 +0000 Subject: [PATCH 12/25] upload wordpress-mu-2.8.2 sources --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index ca82e68..cecb726 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ wordpress-mu-2.7.tar.gz +wordpress-mu-2.8.2.tar.gz diff --git a/sources b/sources index 68fdf49..6d8b1b0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b7d119c663833a3fe00d30224530447e wordpress-mu-2.7.tar.gz +5b412d16fdcc590698af565aa50d046c wordpress-mu-2.8.2.tar.gz From 14cd072f468eecb9da172b79a4846a42941bdffb Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Tue, 4 Aug 2009 17:37:06 +0000 Subject: [PATCH 13/25] reving to 2.8.2 --- wordpress-mu.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wordpress-mu.spec b/wordpress-mu.spec index 75f9165..bd93bea 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,8 +1,8 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.7 -Release: 6%{?dist} +Version: 2.8.2 +Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 Source0: %{name}-%{version}.tar.gz @@ -88,6 +88,7 @@ rm -rf %{buildroot} %{_datadir}/wordpress-mu/wp-mail.php %{_datadir}/wordpress-mu/wp-pass.php %{_datadir}/wordpress-mu/wp-rdf.php +%{_datadir}/wordpress-mu/wp-register.php %{_datadir}/wordpress-mu/wp-rss.php %{_datadir}/wordpress-mu/wp-rss2.php %{_datadir}/wordpress-mu/wp-settings.php @@ -98,6 +99,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Fri Jul 31 2009 Bret McMillan - 2.8.2-1 +- Update to WordPress MU 2.8.2 + * Mon Jul 27 2009 Fedora Release Engineering - 2.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 2c869509cc97c9acbabe5a74bedf5acc30f4b84b Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Wed, 12 Aug 2009 15:42:25 +0000 Subject: [PATCH 14/25] update to 2.8.4a, includes security fixes --- wordpress-mu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress-mu.spec b/wordpress-mu.spec index bd93bea..741e55a 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,7 +1,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.8.2 +Version: 2.8.4a Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 @@ -99,6 +99,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Wed Aug 12 2009 Bret McMillan - 2.8.4a-1 +- Update to WordPress MU 2.8.4a; several security fixes included + * Fri Jul 31 2009 Bret McMillan - 2.8.2-1 - Update to WordPress MU 2.8.2 From 589f10e15e098b89cdc9fa88a06043106a1fee95 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Wed, 12 Aug 2009 15:44:58 +0000 Subject: [PATCH 15/25] 2.8.4a sources --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index cecb726..dc0df2e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ wordpress-mu-2.7.tar.gz wordpress-mu-2.8.2.tar.gz +wordpress-mu-2.8.4a.tar.gz diff --git a/sources b/sources index 6d8b1b0..5fcaff5 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ b7d119c663833a3fe00d30224530447e wordpress-mu-2.7.tar.gz 5b412d16fdcc590698af565aa50d046c wordpress-mu-2.8.2.tar.gz +72dcdfaa60ede87d320b479579028d5e wordpress-mu-2.8.4a.tar.gz From 43ba1e8b5f679abbbfb5316afee639c56a879b80 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Fri, 6 Nov 2009 21:34:40 +0000 Subject: [PATCH 16/25] update to 2.8.5.2 for security fixes --- .cvsignore | 4 +--- sources | 4 +--- wordpress-mu.spec | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index dc0df2e..785848a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -wordpress-mu-2.7.tar.gz -wordpress-mu-2.8.2.tar.gz -wordpress-mu-2.8.4a.tar.gz +wordpress-mu-2.8.5.2.tar.gz diff --git a/sources b/sources index 5fcaff5..dbddd58 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -b7d119c663833a3fe00d30224530447e wordpress-mu-2.7.tar.gz -5b412d16fdcc590698af565aa50d046c wordpress-mu-2.8.2.tar.gz -72dcdfaa60ede87d320b479579028d5e wordpress-mu-2.8.4a.tar.gz +7d733e276cb5983f58a39365bc97b81e wordpress-mu-2.8.5.2.tar.gz diff --git a/wordpress-mu.spec b/wordpress-mu.spec index 741e55a..e534d94 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,7 +1,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.8.4a +Version: 2.8.5.2 Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 @@ -99,6 +99,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Fri Nov 6 2009 Bret McMillan - 2.8.5.2-1 +- Update to version 2.8.5.2 for security fixes + * Wed Aug 12 2009 Bret McMillan - 2.8.4a-1 - Update to WordPress MU 2.8.4a; several security fixes included From 09adebf12e2ad4a9bd7ffa0b664d04d3c363fcf2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:16 +0000 Subject: [PATCH 17/25] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 70626f2..58736f5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wordpress-mu -# $Id$ +# $Id: Makefile,v 1.1 2008/08/25 19:55:16 kevin Exp $ NAME := wordpress-mu SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1784927f8f8bdc715a7f7a0a89fe18ed14af814e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:12 +0000 Subject: [PATCH 18/25] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 70626f2..58736f5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wordpress-mu -# $Id$ +# $Id: Makefile,v 1.1 2008/08/25 19:55:16 kevin Exp $ NAME := wordpress-mu SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f660bf80bbba267e5369361f1149acde14cecdfc Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Mon, 30 Nov 2009 21:53:45 +0000 Subject: [PATCH 19/25] updating to 2.8.6 --- .cvsignore | 2 +- sources | 2 +- wordpress-mu.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 785848a..fd7d8a5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-mu-2.8.5.2.tar.gz +wordpress-mu-2.8.6.tar.gz diff --git a/sources b/sources index dbddd58..7244037 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d733e276cb5983f58a39365bc97b81e wordpress-mu-2.8.5.2.tar.gz +dfa27af33afe0c206933e509edd5835c wordpress-mu-2.8.6.tar.gz diff --git a/wordpress-mu.spec b/wordpress-mu.spec index e534d94..a8a6a49 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,7 +1,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.8.5.2 +Version: 2.8.6 Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 @@ -99,6 +99,9 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Mon Nov 30 2009 Bret McMillan - 2.8.6-1 +- update to 2.8.6; couple of security fixes including 1 XSS + * Fri Nov 6 2009 Bret McMillan - 2.8.5.2-1 - Update to version 2.8.5.2 for security fixes From 974c71425510850683c8310f27bb6a0b9ac78843 Mon Sep 17 00:00:00 2001 From: Bret Richard McMillan Date: Fri, 29 Jan 2010 16:46:44 +0000 Subject: [PATCH 20/25] update to 2.9.1.1 --- .cvsignore | 2 +- sources | 2 +- wordpress-mu.spec | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index fd7d8a5..6ced768 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-mu-2.8.6.tar.gz +wordpress-mu-2.9.1.1.tar.gz diff --git a/sources b/sources index 7244037..33adc56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfa27af33afe0c206933e509edd5835c wordpress-mu-2.8.6.tar.gz +85ffe0c80032257e99ca65c8fe978d3a wordpress-mu-2.9.1.1.tar.gz diff --git a/wordpress-mu.spec b/wordpress-mu.spec index a8a6a49..35360ad 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,7 +1,7 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.8.6 +Version: 2.9.1.1 Release: 1%{?dist} Group: Applications/Publishing License: GPLv2 @@ -99,6 +99,11 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Fri Jan 29 2010 Bret McMillan - 2.9.1.1-1 +- collected bug fixes and enhancements from wordpress 2.9.x merged into wpmu 2.9.1 +- Plugins options fix: http://trac.mu.wordpress.org/ticket/1193 +- wp_getUserBlogs fix: http://trac.mu.wordpress.org/ticket/1195 + * Mon Nov 30 2009 Bret McMillan - 2.8.6-1 - update to 2.8.6; couple of security fixes including 1 XSS From af94c2c4e85e40bd8138c57f1c82e3db0486a148 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:56 +0000 Subject: [PATCH 21/25] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 58736f5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wordpress-mu -# $Id: Makefile,v 1.1 2008/08/25 19:55:16 kevin Exp $ -NAME := wordpress-mu -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 diff --git a/import.log b/import.log deleted file mode 100644 index 4770952..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -wordpress-mu-2_6_1-1_fc8:F-8:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452479 From 7378b919d64c066549924eb4b172aa9a33ea99aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:59 +0000 Subject: [PATCH 22/25] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 58736f5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wordpress-mu -# $Id: Makefile,v 1.1 2008/08/25 19:55:16 kevin Exp $ -NAME := wordpress-mu -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 83b639a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -wordpress-mu-2_6_1-1_fc8:HEAD:wordpress-mu-2.6.1-1.fc8.src.rpm:1220452323 From d2e76309b49ed4ac2e7c2a4dad26a2069e57b912 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 23 Dec 2010 09:42:31 -0600 Subject: [PATCH 23/25] Update, security fixes. --- wordpress-mu-2.9.2-r16625.patch | 9 +++++++++ wordpress-mu.spec | 28 +++++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 wordpress-mu-2.9.2-r16625.patch diff --git a/wordpress-mu-2.9.2-r16625.patch b/wordpress-mu-2.9.2-r16625.patch new file mode 100644 index 0000000..38cff4b --- /dev/null +++ b/wordpress-mu-2.9.2-r16625.patch @@ -0,0 +1,9 @@ +--- wp-includes/comment.php~ 2009-12-21 11:46:30.000000000 -0600 ++++ wp-includes/comment.php 2010-12-23 09:35:38.596027997 -0600 +@@ -1590,5 +1590,5 @@ + $pinged[] = $tb_ping; + } else { +- $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_ping', '')) WHERE ID = %d", $post_id) ); ++ $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) ); + } + } diff --git a/wordpress-mu.spec b/wordpress-mu.spec index 35360ad..9a072c5 100644 --- a/wordpress-mu.spec +++ b/wordpress-mu.spec @@ -1,15 +1,16 @@ Summary: WordPress-MU multi-user blogging software URL: http://mu.wordpress.org/latest.tar.gz Name: wordpress-mu -Version: 2.9.1.1 -Release: 1%{?dist} +Version: 2.9.2 +Release: 2%{?dist} Group: Applications/Publishing License: GPLv2 Source0: %{name}-%{version}.tar.gz Source1: wordpress-mu-httpd-conf Source2: README.fedora.wordpress-mu +Patch0: wordpress-mu-2.9.2-r16625.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.1.0, httpd, php-mysql +Requires: php >= 4.1.0, webserver, php-mysql BuildArch: noarch %description @@ -19,6 +20,8 @@ one instance to serve multiple users. %prep %setup -q -n wordpress-mu +%patch0 -p0 -b .16625 + # disable-wordpress-core-update, updates are always installed via rpm # # the sed script from wordpress.spec doesn't work due to if/else statement in upstream wordpress-mu's update.php @@ -99,25 +102,32 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/wordpress-mu %changelog +* Thu Dec 23 2010 Jon Ciesla - 2.9.2-2 +- Change Requires from httpd to webserver, BZ 523480. +- Patch for security vulnerability, BZ 659319. + +* Mon May 10 2010 Bret McMillan - 2.9.2-1 +- updating to 2.9.2 + * Fri Jan 29 2010 Bret McMillan - 2.9.1.1-1 - collected bug fixes and enhancements from wordpress 2.9.x merged into wpmu 2.9.1 - Plugins options fix: http://trac.mu.wordpress.org/ticket/1193 - wp_getUserBlogs fix: http://trac.mu.wordpress.org/ticket/1195 * Mon Nov 30 2009 Bret McMillan - 2.8.6-1 -- update to 2.8.6; couple of security fixes including 1 XSS +- update to 2.8.6; couple of security fixes, including 1 XSS * Fri Nov 6 2009 Bret McMillan - 2.8.5.2-1 - Update to version 2.8.5.2 for security fixes * Wed Aug 12 2009 Bret McMillan - 2.8.4a-1 -- Update to WordPress MU 2.8.4a; several security fixes included +- Update to version 2.8.4a for security fixes -* Fri Jul 31 2009 Bret McMillan - 2.8.2-1 -- Update to WordPress MU 2.8.2 +* Thu Jul 30 2009 Bret McMillan - 2.7-8 +- fix backported for 2.8.2 comment author XSS vulnerability -* Mon Jul 27 2009 Fedora Release Engineering - 2.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Fri Jul 10 2009 Bret McMillan - 2.7-6 +- Patch for CVE-2009-2334 * Wed Feb 25 2009 Fedora Release Engineering - 2.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 57ba998a10b56dabbd7a1caf3a303cd62f227988 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 23 Dec 2010 09:48:26 -0600 Subject: [PATCH 24/25] Sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6ced768..5bac55a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wordpress-mu-2.9.1.1.tar.gz +/wordpress-mu-2.9.2.tar.gz diff --git a/sources b/sources index 33adc56..d402cca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85ffe0c80032257e99ca65c8fe978d3a wordpress-mu-2.9.1.1.tar.gz +3dff1dd886414ef80ffddba7a33172bf wordpress-mu-2.9.2.tar.gz From 994da414a432d09814c7914c06d326f0e56bfe91 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 3 Jan 2011 12:41:50 -0600 Subject: [PATCH 25/25] Retiring. --- README.fedora.wordpress-mu | 20 ---- dead.package | 2 + sources | 1 - wordpress-mu-2.9.2-r16625.patch | 9 -- wordpress-mu-httpd-conf | 25 ----- wordpress-mu.spec | 163 -------------------------------- 6 files changed, 2 insertions(+), 218 deletions(-) delete mode 100644 README.fedora.wordpress-mu create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wordpress-mu-2.9.2-r16625.patch delete mode 100644 wordpress-mu-httpd-conf delete mode 100644 wordpress-mu.spec diff --git a/README.fedora.wordpress-mu b/README.fedora.wordpress-mu deleted file mode 100644 index 2fba019..0000000 --- a/README.fedora.wordpress-mu +++ /dev/null @@ -1,20 +0,0 @@ -Alias /wordpress-mu /usr/share/wordpress-mu - - - AllowOverride Options - RewriteEngine On - - RewriteBase /wordpress-mu/ - - #uploaded files - RewriteRule ^(.*/)?files/$ index.php [L] - RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] - - RewriteCond %{REQUEST_FILENAME} -f [OR] - RewriteCond %{REQUEST_FILENAME} -d - RewriteRule . - [L] - RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L] - RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] - RewriteRule . index.php [L] - - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9caa2aa --- /dev/null +++ b/dead.package @@ -0,0 +1,2 @@ +Deprecated by upstream as of wordpress 3.0.x. Obsoleted by wordpress +package, which now includes a README on migrating from -mu. diff --git a/sources b/sources deleted file mode 100644 index d402cca..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -3dff1dd886414ef80ffddba7a33172bf wordpress-mu-2.9.2.tar.gz diff --git a/wordpress-mu-2.9.2-r16625.patch b/wordpress-mu-2.9.2-r16625.patch deleted file mode 100644 index 38cff4b..0000000 --- a/wordpress-mu-2.9.2-r16625.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- wp-includes/comment.php~ 2009-12-21 11:46:30.000000000 -0600 -+++ wp-includes/comment.php 2010-12-23 09:35:38.596027997 -0600 -@@ -1590,5 +1590,5 @@ - $pinged[] = $tb_ping; - } else { -- $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_ping', '')) WHERE ID = %d", $post_id) ); -+ $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) ); - } - } diff --git a/wordpress-mu-httpd-conf b/wordpress-mu-httpd-conf deleted file mode 100644 index 49685e8..0000000 --- a/wordpress-mu-httpd-conf +++ /dev/null @@ -1,25 +0,0 @@ -Alias /wordpress-mu /usr/share/wordpress-mu - - - AllowOverride Options - RewriteEngine On - - RewriteBase /wordpress-mu/ - - #uploaded files - RewriteRule ^(.*/)?files/$ index.php [L] - RewriteCond %{REQUEST_URI} !.*wp-content/plugins.* - RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] - - # add a trailing slash to /wp-admin - RewriteCond %{REQUEST_URI} ^.*/wp-admin$ - RewriteRule ^(.+)$ $1/ [R=301,L] - - RewriteCond %{REQUEST_FILENAME} -f [OR] - RewriteCond %{REQUEST_FILENAME} -d - RewriteRule . - [L] - RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L] - RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] - RewriteRule . index.php [L] - - diff --git a/wordpress-mu.spec b/wordpress-mu.spec deleted file mode 100644 index 9a072c5..0000000 --- a/wordpress-mu.spec +++ /dev/null @@ -1,163 +0,0 @@ -Summary: WordPress-MU multi-user blogging software -URL: http://mu.wordpress.org/latest.tar.gz -Name: wordpress-mu -Version: 2.9.2 -Release: 2%{?dist} -Group: Applications/Publishing -License: GPLv2 -Source0: %{name}-%{version}.tar.gz -Source1: wordpress-mu-httpd-conf -Source2: README.fedora.wordpress-mu -Patch0: wordpress-mu-2.9.2-r16625.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.1.0, webserver, php-mysql -BuildArch: noarch - -%description -WordPress-MU is a derivative of the WordPress blogging codebase, to allow -one instance to serve multiple users. - -%prep -%setup -q -n wordpress-mu - -%patch0 -p0 -b .16625 - -# disable-wordpress-core-update, updates are always installed via rpm -# -# the sed script from wordpress.spec doesn't work due to if/else statement in upstream wordpress-mu's update.php -# sed -i -e "s,add_action,#add_action,g" wp-includes/update.php - -echo "" > wp-includes/update.php - -%build - - -%install -rm -rf %{buildroot} - -mkdir -p %{buildroot}%{_datadir}/wordpress-mu -mkdir -p %{buildroot}%{_sysconfdir}/wordpress-mu -install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/wordpress-mu.conf -install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_docdir}/%{name}-%{version}/README.fedora - -cp -pr * %{buildroot}%{_datadir}/wordpress-mu - -# fix weird upstream perms... -chmod 0644 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/css/content.css -chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js -chmod 0664 %{buildroot}%{_datadir}/wordpress-mu/wp-includes/js/tinymce/plugins/spellchecker/config.php - - -# since we're using /etc/httpd/conf.d, don't do the funky .htaccess stuff -# that the installer wants -echo "# please see /etc/httpd/conf.d/wordpress-mu.conf" > %{buildroot}%{_datadir}/wordpress-mu/htaccess.dist - - -# Remove empty files to make rpmlint happy -find %{buildroot} -empty -exec rm -f {} \; -# These are docs, remove them from here, docify them later -rm -f %{buildroot}%{_datadir}/wordpress-mu/{license.txt,README.txt} -# remove these as well, detritus -rm -f %{buildroot}%{_datadir}/wordpress-mu/{wordpress-mu-httpd-conf,README.fedora} - - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress-mu.conf -%dir %{_datadir}/wordpress-mu -%{_datadir}/wordpress-mu/htaccess.dist -%{_datadir}/wordpress-mu/wp-admin -%{_datadir}/wordpress-mu/wp-content -%{_datadir}/wordpress-mu/wp-includes -%{_datadir}/wordpress-mu/index.php -%doc license.txt -%doc README.txt -%{_datadir}/wordpress-mu/index-install.php -%{_datadir}/wordpress-mu/wp-activate.php -%{_datadir}/wordpress-mu/wp-atom.php -%{_datadir}/wordpress-mu/wp-app.php -%{_datadir}/wordpress-mu/wp-blog-header.php -%{_datadir}/wordpress-mu/wp-comments-post.php -%{_datadir}/wordpress-mu/wp-commentsrss2.php -%{_datadir}/wordpress-mu/wp-config-sample.php -%{_datadir}/wordpress-mu/wp-cron.php -%{_datadir}/wordpress-mu/wp-feed.php -%{_datadir}/wordpress-mu/wp-load.php -%{_datadir}/wordpress-mu/wp-links-opml.php -%{_datadir}/wordpress-mu/wp-login.php -%{_datadir}/wordpress-mu/wp-mail.php -%{_datadir}/wordpress-mu/wp-pass.php -%{_datadir}/wordpress-mu/wp-rdf.php -%{_datadir}/wordpress-mu/wp-register.php -%{_datadir}/wordpress-mu/wp-rss.php -%{_datadir}/wordpress-mu/wp-rss2.php -%{_datadir}/wordpress-mu/wp-settings.php -%{_datadir}/wordpress-mu/wpmu-settings.php -%{_datadir}/wordpress-mu/wp-signup.php -%{_datadir}/wordpress-mu/wp-trackback.php -%{_datadir}/wordpress-mu/xmlrpc.php -%dir %{_sysconfdir}/wordpress-mu - -%changelog -* Thu Dec 23 2010 Jon Ciesla - 2.9.2-2 -- Change Requires from httpd to webserver, BZ 523480. -- Patch for security vulnerability, BZ 659319. - -* Mon May 10 2010 Bret McMillan - 2.9.2-1 -- updating to 2.9.2 - -* Fri Jan 29 2010 Bret McMillan - 2.9.1.1-1 -- collected bug fixes and enhancements from wordpress 2.9.x merged into wpmu 2.9.1 -- Plugins options fix: http://trac.mu.wordpress.org/ticket/1193 -- wp_getUserBlogs fix: http://trac.mu.wordpress.org/ticket/1195 - -* Mon Nov 30 2009 Bret McMillan - 2.8.6-1 -- update to 2.8.6; couple of security fixes, including 1 XSS - -* Fri Nov 6 2009 Bret McMillan - 2.8.5.2-1 -- Update to version 2.8.5.2 for security fixes - -* Wed Aug 12 2009 Bret McMillan - 2.8.4a-1 -- Update to version 2.8.4a for security fixes - -* Thu Jul 30 2009 Bret McMillan - 2.7-8 -- fix backported for 2.8.2 comment author XSS vulnerability - -* Fri Jul 10 2009 Bret McMillan - 2.7-6 -- Patch for CVE-2009-2334 - -* Wed Feb 25 2009 Fedora Release Engineering - 2.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Feb 12 2009 Bret McMillan - 2.7-4 -- Update to version 2.7 -- Alter source prep so I can still use upstream's tarball -- favicon.ico removed from manifest - -* Mon Dec 1 2008 Bret McMillan - 2.6.5-1 -- Update to 2.6.5 -- http://wordpress.org/development/2008/11/wordpress-265/ -- http://ocaoimh.ie/2008/11/25/wordpress-mu-265/ -- Fixes 1 XSS security issue, 3 bugs - -* Wed Sep 3 2008 Bret McMillan - 2.6.1-1 -- update to 2.6.1 - -* Tue Jul 29 2008 Bret McMillan - 2.6-7 -- added build section to the spec file - -* Wed Jul 29 2008 Bret McMillan - 2.6-6 -- rebasing to wpmu 2.6 - -* Fri May 30 2008 Bret McMillan - 1.5.1-2 -- trying to clean up how we're dealing with htaccess.dist - -* Mon May 26 2008 Bret McMillan - 1.5.1-1 -- update to 1.5.1; getting ready for Fedora submission - -* Fri Apr 25 2008 Bret McMillan - 1.3.3-1 -- initial version; copying heuristics from the base fedora wordpress pkg -