From ec838a546157eb9dd625a72cd630ab4df005d740 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:11:15 +0000 Subject: [PATCH 01/11] Initialize branch F-11 for wordpress --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 157e22ad704266aac948b9a3addde551fed3b4aa Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 10 Jul 2009 19:44:08 +0000 Subject: [PATCH 02/11] - updated to 2.8.1 for security fixes - BZ 510745 --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 928bd1e..d1bf8ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.7.1.tar.gz +wordpress-2.8.1.tar.gz diff --git a/sources b/sources index 1c46f9a..577b3d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f1e1607e5ce1328c305e0192ff3352a wordpress-2.7.1.tar.gz +b389dbbf60749ddc6c33f49740460a09 wordpress-2.8.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 989195d..c753e5b 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.7.1 +Version: 2.8.1 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -75,6 +75,12 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Fri Jul 10 2009 Adrian Reber - 2.8.1-1 +- updated to 2.8.1 for security fixes - BZ 510745 + +* Mon Jun 22 2009 Adrian Reber - 2.8-1 +- updated to 2.8 + * Wed Feb 25 2009 Fedora Release Engineering - 2.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 0e3a27248f1fbd2658f299f82c0032492b4bc441 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 28 Jul 2009 08:52:42 +0000 Subject: [PATCH 03/11] - updated to 2.8.2 for security fixes - BZ 512900 - fixed "wrong-script-end-of-line-encoding" of license.txt - correctly disable auto update check - fixed an error message from 'find' during the build --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 23 +++++++++++++++++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index d1bf8ee..0fc74bf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.8.1.tar.gz +wordpress-2.8.2.tar.gz diff --git a/sources b/sources index 577b3d4..a51df1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b389dbbf60749ddc6c33f49740460a09 wordpress-2.8.1.tar.gz +8fde8c4aa3e4d86ce9ddca7cdc0769a2 wordpress-2.8.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index c753e5b..e44c831 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.8.1 +Version: 2.8.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -18,9 +18,11 @@ almost trivial, to get information out to people on the web. %prep %setup -q -n wordpress -# disable-wordpress-core-update, updates are always installed via rpm -# this does not disable the wordpress-plugins-update check -sed -i -e "s,^add_action,#add_action,g" wp-includes/update.php +# 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 +# fix file encoding +sed -i -e 's/\r//' license.txt %install mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress @@ -28,11 +30,11 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/wordpress.conf cp -pr * ${RPM_BUILD_ROOT}%{_datadir}/wordpress cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress/'|g" > \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php + ${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 # Remove empty files to make rpmlint happy -find ${RPM_BUILD_ROOT} -empty -exec rm -f {} \; +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} @@ -75,6 +77,15 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Jul 28 2009 Adrian Reber - 2.8.2-1 +- updated to 2.8.2 for security fixes - BZ 512900 +- fixed "wrong-script-end-of-line-encoding" of license.txt +- correctly disable auto update check +- fixed an error message from 'find' during the build + +* Mon Jul 27 2009 Fedora Release Engineering - 2.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Jul 10 2009 Adrian Reber - 2.8.1-1 - updated to 2.8.1 for security fixes - BZ 510745 From 629797fab97c794e15c24d31080462eb7699d8b0 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 5 Aug 2009 07:45:37 +0000 Subject: [PATCH 04/11] - updated to 2.8.3 for security fixes --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index e44c831..2c6dc48 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.8.2 +Version: 2.8.3 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -77,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Mon Aug 03 2009 Adrian Reber - 2.8.3-1 +- updated to 2.8.3 for security fixes + * Tue Jul 28 2009 Adrian Reber - 2.8.2-1 - updated to 2.8.2 for security fixes - BZ 512900 - fixed "wrong-script-end-of-line-encoding" of license.txt From 778ca6ce19d121d0cc525376c6f9653c75e1af11 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 5 Aug 2009 09:48:32 +0000 Subject: [PATCH 05/11] - updated to 2.8.3 for security fixes --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0fc74bf..e8cf7c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.8.2.tar.gz +wordpress-2.8.3.tar.gz diff --git a/sources b/sources index a51df1f..3f42303 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fde8c4aa3e4d86ce9ddca7cdc0769a2 wordpress-2.8.2.tar.gz +0edfb5145f4b246eed72646355c45ea0 wordpress-2.8.3.tar.gz From 3a4dfa382b42d3a19ae77f1d62eb8711b8965a1a Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 11 Aug 2009 10:28:10 +0000 Subject: [PATCH 06/11] - another security update to fix "Remote admin reset password": http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.h tml --- changeset_r11798.diff | 11 +++++++++++ wordpress.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 changeset_r11798.diff diff --git a/changeset_r11798.diff b/changeset_r11798.diff new file mode 100644 index 0000000..0945215 --- /dev/null +++ b/changeset_r11798.diff @@ -0,0 +1,11 @@ +Index: /branches/2.8/wp-login.php +=================================================================== +--- /branches/2.8/wp-login.php (revision 11514) ++++ /branches/2.8/wp-login.php (revision 11798) +@@ -188,5 +188,5 @@ + $key = preg_replace('/[^a-z0-9]/i', '', $key); + +- if ( empty( $key ) ) ++ if ( empty( $key ) || is_array( $key ) ) + return new WP_Error('invalid_key', __('Invalid key')); + diff --git a/wordpress.spec b/wordpress.spec index 2c6dc48..ff6ec9d 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,7 +3,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 2.8.3 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -11,6 +11,7 @@ Source2: README.fedora.wordpress BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php >= 4.1.0, httpd, php-mysql BuildArch: noarch +Patch0: changeset_r11798.diff %description Wordpress is an online publishing / weblog package that makes it very easy, @@ -18,6 +19,7 @@ almost trivial, to get information out to people on the web. %prep %setup -q -n wordpress +%patch0 -p3 # 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 @@ -77,6 +79,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Aug 11 2009 Adrian Reber - 2.8.3-2 +- another security update to fix "Remote admin reset password": + http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html + * Mon Aug 03 2009 Adrian Reber - 2.8.3-1 - updated to 2.8.3 for security fixes From f874d585319a91f7e1404bcb7f978efcbec01a12 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 30 Aug 2009 19:29:37 +0000 Subject: [PATCH 07/11] - updated to 2.8.4 (security fixes were already available with 2.8.3-2) --- .cvsignore | 2 +- changeset_r11798.diff | 11 ----------- sources | 2 +- wordpress.spec | 13 +++++++++---- 4 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 changeset_r11798.diff diff --git a/.cvsignore b/.cvsignore index e8cf7c8..08171c3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.8.3.tar.gz +wordpress-2.8.4.tar.gz diff --git a/changeset_r11798.diff b/changeset_r11798.diff deleted file mode 100644 index 0945215..0000000 --- a/changeset_r11798.diff +++ /dev/null @@ -1,11 +0,0 @@ -Index: /branches/2.8/wp-login.php -=================================================================== ---- /branches/2.8/wp-login.php (revision 11514) -+++ /branches/2.8/wp-login.php (revision 11798) -@@ -188,5 +188,5 @@ - $key = preg_replace('/[^a-z0-9]/i', '', $key); - -- if ( empty( $key ) ) -+ if ( empty( $key ) || is_array( $key ) ) - return new WP_Error('invalid_key', __('Invalid key')); - diff --git a/sources b/sources index 3f42303..dfab4f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0edfb5145f4b246eed72646355c45ea0 wordpress-2.8.3.tar.gz +0e8b296d4e2d4189b349f1d0f727bd98 wordpress-2.8.4.tar.gz diff --git a/wordpress.spec b/wordpress.spec index ff6ec9d..9a60780 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.8.3 +Version: 2.8.4 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -11,7 +11,6 @@ Source2: README.fedora.wordpress BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php >= 4.1.0, httpd, php-mysql BuildArch: noarch -Patch0: changeset_r11798.diff %description Wordpress is an online publishing / weblog package that makes it very easy, @@ -19,10 +18,13 @@ almost trivial, to get information out to people on the web. %prep %setup -q -n wordpress -%patch0 -p3 # 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 +# disable update_nag() function +sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \ + s,\(.*\)\$msg .=\(.*\),\1\$msg .= '';,g;" \ + wp-admin/includes/update.php # fix file encoding sed -i -e 's/\r//' license.txt @@ -79,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Sun Aug 30 2009 Adrian Reber - 2.8.4-1 +- updated to 2.8.4 (security fixes were already available with 2.8.3-2) + * Tue Aug 11 2009 Adrian Reber - 2.8.3-2 - another security update to fix "Remote admin reset password": http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html From 8cda8d95c4c90b4f7b5db000995dca55566db311 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 21 Oct 2009 14:15:26 +0000 Subject: [PATCH 08/11] - updated to 2.8.5 (Hardening Release) --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 08171c3..d4cb9aa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.8.4.tar.gz +wordpress-2.8.5.tar.gz diff --git a/sources b/sources index dfab4f8..e53f607 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e8b296d4e2d4189b349f1d0f727bd98 wordpress-2.8.4.tar.gz +85f6a9c5f8ce88b784a9fda81303cbc1 wordpress-2.8.5.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 9a60780..432ccef 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.8.4 +Version: 2.8.5 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Oct 21 2009 Adrian Reber - 2.8.5-1 +- updated to 2.8.5 (Hardening Release) + * Sun Aug 30 2009 Adrian Reber - 2.8.4-1 - updated to 2.8.4 (security fixes were already available with 2.8.3-2) From f5cb3c42f69c987a93e163a18a2cca2c77170507 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 16 Nov 2009 09:44:23 +0000 Subject: [PATCH 09/11] - updated to 2.8.6 (Security Release) --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d4cb9aa..d36dfea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.8.5.tar.gz +wordpress-2.8.6.tar.gz diff --git a/sources b/sources index e53f607..4e01de6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85f6a9c5f8ce88b784a9fda81303cbc1 wordpress-2.8.5.tar.gz +1956f09f2abe74ed85e0de04d511d433 wordpress-2.8.6.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 432ccef..31788b0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.8.5 +Version: 2.8.6 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Mon Nov 16 2009 Adrian Reber - 2.8.6-2 +- updated to 2.8.6 (Security Release) + * Wed Oct 21 2009 Adrian Reber - 2.8.5-1 - updated to 2.8.5 (Hardening Release) From 64c26ca16493874861c056d2f32e48ad3931b27c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:05 +0000 Subject: [PATCH 10/11] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b7ae9bc..f25a67e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wordpress 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 69f9c86dc79b16091b84cd012025212849485549 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:52 +0000 Subject: [PATCH 11/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 f25a67e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wordpress -# $Id$ -NAME := wordpress -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11