From 275baf237a386ab58146100842faef7803704eb4 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 21 Oct 2009 14:12:06 +0000 Subject: [PATCH 1/9] - 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 79095df802187a900b1d4a6d5ce6573434c0c6fe Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 16 Nov 2009 09:38:09 +0000 Subject: [PATCH 2/9] - updated to 2.8.5 (Security Release) --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 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..ea783ae 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.5 +Version: 2.8.6 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Mon Nov 16 2009 Adrian Reber - 2.8.6-1 +- updated to 2.8.5 (Security Release) + * Wed Oct 21 2009 Adrian Reber - 2.8.5-1 - updated to 2.8.5 (Hardening Release) From c225a939bf9157de4fe66bf4244ffe1ce5e922c4 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 16 Nov 2009 09:43:38 +0000 Subject: [PATCH 3/9] - updated to 2.8.6 (Security Release) --- wordpress.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index ea783ae..31788b0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,7 +3,7 @@ URL: http://www.wordpress.org Name: wordpress 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,8 +81,8 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog -* Mon Nov 16 2009 Adrian Reber - 2.8.6-1 -- updated to 2.8.5 (Security Release) +* 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 c0ea13b2ea8b00bd1027c028470cea497b41f66e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:05 +0000 Subject: [PATCH 4/9] 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 2c1d4a39c5d7100196eb44b9e7da09ac33d33ce8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:28:37 +0000 Subject: [PATCH 5/9] Initialize branch EL-6 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..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 499ab12b8ef92842cfd78e67305c1d34a75b70ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:51 +0000 Subject: [PATCH 6/9] 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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From ab441cd48a9e59e5926b0d64572fca63240e478a Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 23 Dec 2010 09:20:13 -0600 Subject: [PATCH 7/9] EVR. --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index d2bc33f..e42c4b9 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,7 +3,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.0.3 Group: Applications/Publishing -Release: 2%{?dist} +Release: 2.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 +* Thu Dec 23 2010 Jon Ciesla - 3.0.3-2.1 +- EVR bump. + * 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 8d0c209d53a7dfc1685a9c8e21d12f9003f08e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Thu, 2 Jun 2011 12:16:05 +0200 Subject: [PATCH 8/9] Wrong target of moving wp-content/ --- wordpress.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 5c3b428..41ea9de 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -82,8 +82,8 @@ mv -v ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-content/ \ if [ $1 -eq 2 ] ; then # In case user has old wp-content from previous version, move it to # the new location. -mv -v %{_datadir}/wordpress/wp-content/* \ - %{_localstatedir}/www/wordpress/wp-content/ +mv -vf %{_datadir}/wordpress/wp-content/* \ + %{_localstatedir}/www/wordpress/ /sbin/restorecon -R %{_localstatedir}/www/wordpress/ fi From 6ba3b2674bc9f48d1bb676478b488a8c71089546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Thu, 2 Jun 2011 14:31:48 +0200 Subject: [PATCH 9/9] Finally working (although not as I would like) WP 3.1.3. Also: * Actually, we just don't need gettext.php at all, it is provided by php itself. Just remove the file, don't make a symlink. * Revert back to wp-content in /usr/share/wordpress, I am not able to make it work. Not fixing BZ 522897. --- wordpress-move-wp-content.patch | 22 ++++++++++++++++++-- wordpress.spec | 37 +++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/wordpress-move-wp-content.patch b/wordpress-move-wp-content.patch index 7dd738e..54eb921 100644 --- a/wordpress-move-wp-content.patch +++ b/wordpress-move-wp-content.patch @@ -1,6 +1,6 @@ diff -up wordpress/wp-includes/default-constants.php.rhbz522897 wordpress/wp-includes/default-constants.php ---- wordpress/wp-includes/default-constants.php.rhbz522897 2011-05-25 22:02:51.857213589 +0200 -+++ wordpress/wp-includes/default-constants.php 2011-05-25 22:19:01.211438543 +0200 +--- wordpress/wp-includes/default-constants.php.rhbz522897 2010-05-26 04:42:15.000000000 +0200 ++++ wordpress/wp-includes/default-constants.php 2011-06-02 12:29:57.919714584 +0200 @@ -39,7 +39,7 @@ function wp_initial_constants( ) { @ini_set('memory_limit', WP_MEMORY_LIMIT); @@ -10,3 +10,21 @@ diff -up wordpress/wp-includes/default-constants.php.rhbz522897 wordpress/wp-inc // Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development. if ( !defined('WP_DEBUG') ) +@@ -75,7 +75,7 @@ function wp_initial_constants( ) { + */ + function wp_plugin_directory_constants( ) { + if ( !defined('WP_CONTENT_URL') ) +- define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up ++ define( 'WP_CONTENT_URL', get_option('siteurl')); // full url - WP_CONTENT_DIR is defined further up + + /** + * Allows for the plugins directory to be moved from the default location. +@@ -100,7 +100,7 @@ function wp_plugin_directory_constants( + * @deprecated + */ + if ( !defined('PLUGINDIR') ) +- define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat. ++ define( 'PLUGINDIR', WP_CONTENT_DIR . 'plugins' ); // Relative to ABSPATH. For back compat. + + /** + * Allows for the mu-plugins directory to be moved from the default location. diff --git a/wordpress.spec b/wordpress.spec index 41ea9de..051c85e 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,7 +3,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.1.3 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -31,7 +31,7 @@ almost trivial, to get information out to people on the web. %setup -q -n wordpress %patch0 -p1 -b .dolly -%patch1 -p1 -b .rhbz522897 +#%patch1 -p1 -b .rhbz522897 %patch2 -p1 -b .FSFaddr # disable wp_version_check, updates are always installed via rpm @@ -63,7 +63,6 @@ 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 @@ -72,20 +71,20 @@ ln -sf /usr/share/php/php-simplepie/simplepie.inc ${RPM_BUILD_ROOT}%{_datadir}/w # Remove backup copies of patches find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) -print -delete -# Move wp-content directory to /var/www location -mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress -mv -v ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-content/ \ - ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress +## Move wp-content directory to /var/www location +#mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress +#mv -v ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-content/ \ +# ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress -%post -if [ $1 -eq 2 ] ; then -# In case user has old wp-content from previous version, move it to -# the new location. -mv -vf %{_datadir}/wordpress/wp-content/* \ - %{_localstatedir}/www/wordpress/ -/sbin/restorecon -R %{_localstatedir}/www/wordpress/ -fi +#%post +#if [ $1 -eq 2 ] ; then +## In case user has old wp-content from previous version, move it to +## the new location. +#mv -uf %{_datadir}/wordpress/wp-content/* \ +# %{_localstatedir}/www/wordpress/ +#/sbin/restorecon -R %{_localstatedir}/www/wordpress/ +#fi %clean rm -rf ${RPM_BUILD_ROOT} @@ -95,8 +94,8 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress.conf %dir %{_datadir}/wordpress %{_datadir}/wordpress/wp-admin -%attr(-,apache,apache) %{_localstatedir}/www/wordpress/ %{_datadir}/wordpress/wp-includes +%{_datadir}/wordpress/wp-content %{_datadir}/wordpress/index.php %doc license.txt %doc readme.html @@ -108,6 +107,12 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Thu Jun 02 2011 Matěj Cepl - 3.1.3-3 +- Actually, we just don't need gettext.php at all, it is provided by + php itself. Just remove the file, don't make a symlink. +- revert back to wp-content in /usr/share/wordpress, I am not able to make it + work. Not fixing BZ 522897. + * Wed Jun 01 2011 Matěj Cepl - 3.1.3-2 - Fix old FSF address and Summary to make rpmlint happy. - Make wp-content directory owned by apache:apache