rpms/wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- update to 3.7

Browse source 
- requires ca-certificates for ca-bundle.crt
This commit is contained in:
Remi Collet 2013-10-25 15:00:03 +02:00
commit 53cd9832fd
8 changed files with 135 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

39
.gitignore vendored
View file

@ -1,40 +1,3 @@
*spec~
clog
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
/wordpress-3.1.1.tar.gz
/wordpress-3.1.2.tar.gz
/wordpress-3.1.3.tar.gz
/wordpress-3.2-RC1.zip
/wordpress-3.2-RC3.zip
/wordpress-3.2.tar.gz
/wordpress-3.2.1.tar.gz
/wordpress-3.3-beta2.tar.gz
/wordpress-3.3-beta3.tar.gz
/wordpress-3.3-beta4.tar.gz
/wordpress-3.3-RC1.tar.gz
/wordpress-3.3-RC2.tar.gz
/wordpress-3.3.tar.gz
/wordpress-3.3.1.tar.gz
/wordpress-3.4-beta1.tar.gz
/wordpress-3.4-beta2.tar.gz
/wordpress-3.4-beta3.tar.gz
/wordpress-3.4-beta4.tar.gz
/wordpress-3.4-RC1.tar.gz
/wordpress-3.4-RC2.tar.gz
/wordpress-3.4-RC3.tar.gz
/wordpress-3.4.tar.gz
/wordpress-3.4.1.tar.gz
/wordpress-3.4.2.tar.gz
/wordpress-3.5-beta-1.tar.gz
/wordpress-3.5-beta2.tar.gz
/wordpress-3.5-beta3.tar.gz
/wordpress-3.5-RC1.tar.gz
/wordpress-3.5-RC2.tar.gz
/wordpress-3.5-RC3.tar.gz
/wordpress-3.5.tar.gz
/wordpress-3.5.1.tar.gz
/wordpress-3.5.2.tar.gz
/wordpress-3.7.tar.gz

43
README.fedora.wordpress
View file

@ -1,9 +1,6 @@
Wordpress is a database driven blogging program designed to make it exceedingly
easy to publish an online blog, sometimes also called a weblog or journal.
CONFIGURING WORDPRESS FOR THE FIRST TIME
----------------------------------------
Once this package is installed, there are a few configuration items which need
to be performed before the blog is usable. First, you need to establish a
username and password to connect to your MySQL database as, and make both
@ -47,27 +44,23 @@ open a web browser to http://localhost/wordpress/wp-admin/install.php and
follow the instructions given to you on the pages you see to set up the
database tables and begin publishing your blog.
Wordpress ships with Flash and Silverlight plugins for the 'plupload' file
uploader and the 'mediaelement' media player embedder. The idea is to try and
be able to provide a multi-file uploader and an embedded video player when
HTML5 is not available (or does not support the video format in question).
These plugins are provided as pre-built binaries and there is no mechanism
for building them from source during Wordpress compilation. As the inclusion
of pre-built binaries is against Fedora policy - see
https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries
- these plugins have been removed from the Fedora package. As a consequence:
UPGRADING WORDPRESS
-------------------
In order to upgrade from a 2.1 series package, there are several steps you
will need to take. If you've already performed the 'yum update', all is not
lost, and you more than likely still be able to complete the upgrade
painlessly.
a) any Wordpress element or plugin that uses the 'plupload' will only present
an HTML5-based multi-file uploader if HTML5 is supported by the user's browser
or an HMTL4-based single-file uploader in HTML5 is not supported. No Flash
or Silverlight-based multi-file uploader will be provided.
First, you will want to back up your entire database. This is simply common
sense, but it is also mentioned explicitly in Wordpress's upgrade instructions.
You should have disabled all your plugins. Having old plugins still active
could cause problems, as the old plugins may not be compatible with the new
version of Wordpress.
Once all the plugins are disabled, run the actual yum update. Once this
completes, you should point a browser at
http://<your wordpress host>/wordpress/wp-admin/upgrade.php and follow the
instructions that appear in the browser window. Once this is completed, you
can begin reactivating plugins one at a time.
If you need a more detailed upgrade document, or you run into problems, please
see the Wordpress upgrade documentation at
http://codex.wordpress.org/Upgrading_WordPress#Detailed_Instructions
b) If you try to embed media into a Wordpress post using the [video] and
[audio] short tags, the media player will be visible if the reader is using
a browser that has HTML5 support for the media format in question; if not, the
'Download Media' link will be offered. No Flash or Silverlight-based player
element will be included.

2
sources
View file

@ -1 +1 @@
90acae65199db7b33084ef36860d7f22 wordpress-3.5.2.tar.gz
aaad36cd739b825952cf3e09de5e7856 wordpress-3.7.tar.gz

11
wordpress-3.6-mediaelement-noflash_silverlight.patch Normal file
View file

@ -0,0 +1,11 @@
--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js 2013-08-01 06:47:23.000000000 -0700
+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js.new 2013-08-23 16:02:01.491295485 -0700
@@ -37,7 +37,7 @@
this.attributes},removeAttribute:function(a){delete this.attributes[a]},getAttribute:function(a){if(this.hasAttribute(a))return this.attributes[a];return""},setAttribute:function(a,b){this.attributes[a]=b},remove:function(){mejs.Utility.removeSwf(this.pluginElement.id);mejs.MediaPluginBridge.unregisterPluginElement(this.pluginElement.id)}};
mejs.MediaPluginBridge={pluginMediaElements:{},htmlMediaElements:{},registerPluginElement:function(a,b,c){this.pluginMediaElements[a]=b;this.htmlMediaElements[a]=c},unregisterPluginElement:function(a){delete this.pluginMediaElements[a];delete this.htmlMediaElements[a]},initPlugin:function(a){var b=this.pluginMediaElements[a],c=this.htmlMediaElements[a];if(b){switch(b.pluginType){case "flash":b.pluginElement=b.pluginApi=document.getElementById(a);break;case "silverlight":b.pluginElement=document.getElementById(b.id);
b.pluginApi=b.pluginElement.Content.MediaElementJS}b.pluginApi!=null&&b.success&&b.success(b,c)}},fireEvent:function(a,b,c){var d,e;if(a=this.pluginMediaElements[a]){b={type:b,target:a};for(d in c){a[d]=c[d];b[d]=c[d]}e=c.bufferedTime||0;b.target.buffered=b.buffered={start:function(){return 0},end:function(){return e},length:1};a.dispatchEvent(b.type,b)}}};
-mejs.MediaElementDefaults={mode:"auto",plugins:["flash","silverlight","youtube","vimeo"],enablePluginDebug:false,httpsBasicAuthSite:false,type:"",pluginPath:mejs.Utility.getScriptPath(["mediaelement.js","mediaelement.min.js","mediaelement-and-player.js","mediaelement-and-player.min.js"]),flashName:"flashmediaelement.swf",flashStreamer:"",enablePluginSmoothing:false,enablePseudoStreaming:false,pseudoStreamingStartQueryParam:"start",silverlightName:"silverlightmediaelement.xap",defaultVideoWidth:480,
+mejs.MediaElementDefaults={mode:"auto",plugins:["youtube","vimeo"],enablePluginDebug:false,httpsBasicAuthSite:false,type:"",pluginPath:mejs.Utility.getScriptPath(["mediaelement.js","mediaelement.min.js","mediaelement-and-player.js","mediaelement-and-player.min.js"]),flashName:"flashmediaelement.swf",flashStreamer:"",enablePluginSmoothing:false,enablePseudoStreaming:false,pseudoStreamingStartQueryParam:"start",silverlightName:"silverlightmediaelement.xap",defaultVideoWidth:480,
defaultVideoHeight:270,pluginWidth:-1,pluginHeight:-1,pluginVars:[],timerRate:250,startVolume:0.8,success:function(){},error:function(){}};mejs.MediaElement=function(a,b){return mejs.HtmlMediaElementShim.create(a,b)};
mejs.HtmlMediaElementShim={create:function(a,b){var c=mejs.MediaElementDefaults,d=typeof a=="string"?document.getElementById(a):a,e=d.tagName.toLowerCase(),f=e==="audio"||e==="video",g=f?d.getAttribute("src"):d.getAttribute("href");e=d.getAttribute("poster");var h=d.getAttribute("autoplay"),l=d.getAttribute("preload"),j=d.getAttribute("controls"),k;for(k in b)c[k]=b[k];g=typeof g=="undefined"||g===null||g==""?null:g;e=typeof e=="undefined"||e===null?"":e;l=typeof l=="undefined"||l===null||l==="false"?
"none":l;h=!(typeof h=="undefined"||h===null||h==="false");j=!(typeof j=="undefined"||j===null||j==="false");k=this.determinePlayback(d,c,mejs.MediaFeatures.supportsMediaTag,f,g);k.url=k.url!==null?mejs.Utility.absolutizeUrl(k.url):"";if(k.method=="native"){if(mejs.MediaFeatures.isBustedAndroid){d.src=k.url;d.addEventListener("click",function(){d.play()},false)}return this.updateNative(k,c,h,l)}else if(k.method!=="")return this.createPlugin(k,c,e,h,l,j);else{this.createErrorMessage(k,c,e);return this}},

18
wordpress-3.6-no_swfupload.patch Normal file
View file

@ -0,0 +1,18 @@
--- wordpress/wp-includes/script-loader.php 2013-08-01 06:47:23.000000000 -0700
+++ wordpress/wp-includes/script-loader.php.new 2013-08-23 00:10:37.406222565 -0700
@@ -252,15 +252,6 @@
$scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array('plupload-all', 'jquery', 'json2', 'media-models'), false, 1 );
did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
- // keep 'swfupload' for back-compat.
- $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
- $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
- $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
- $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
- $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
- $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
- did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
-
$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js" );
$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23');

6
wordpress-3.6-tinymce_noflash.patch Normal file
View file

File diff suppressed because one or more lines are too long

6
wordpress-debian_patches_hello.patch
View file

@ -1,9 +1,9 @@
--- 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
--- wordpress/wp-content/plugins/hello.php 2013-05-22 14:08:40.000000000 -0700
+++ wordpress/wp-content/plugins/hello.php.new 2013-08-22 23:46:04.594788007 -0700
@@ -6,42 +6,26 @@
/*
Plugin Name: Hello Dolly
Plugin URI: http://wordpress.org/extend/plugins/hello-dolly/
Plugin URI: http://wordpress.org/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 <cite>Hello, Dolly</cite> 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 <cite>Free Software Song</cite> in the upper right of your admin screen on every page.
Author: Matt Mullenweg

93
wordpress.spec
View file

@ -1,25 +1,41 @@
%global wp_content %{_datadir}/wordpress/wp-content
%global betatag RC3
Summary: Blog tool and publishing platform
URL: http://www.wordpress.org
Name: wordpress
Version: 3.5.2
Group: Applications/Publishing
#Release: 0.5.%{betatag}%{?dist}
Release: 1%{?dist}
License: GPLv2
#Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz
Source0: http://wordpress.org/%{name}-%{version}.tar.gz
Source1: wordpress-httpd-conf
Source2: README.fedora.wordpress
Source3: README.fedora.wordpress-mu
%if 0%{?rhel} == 5
%global with_cacert 0
%else
%global with_cacert 1
%endif
Summary: Blog tool and publishing platform
URL: http://www.wordpress.org
Name: wordpress
Version: 3.7
Group: Applications/Publishing
Release: 1%{?dist}
License: GPLv2
Source0: http://wordpress.org/%{name}-%{version}.tar.gz
Source1: wordpress-httpd-conf
Source2: README.fedora.wordpress
Source3: README.fedora.wordpress-mu
# Patch out copyrighted text of Hello, Dolly
# (and replace it with Free Software Song)
Patch0: wordpress-debian_patches_hello.patch
# Move wp-content to /var/www/wordpress/
# This patch doesn’t work well, see bugzilla.redhat.com/522897
Patch1: wordpress-move-wp-content.patch
# Drop swfupload: not built from source, not reasonably possible to do
Patch2: wordpress-3.6-no_swfupload.patch
# Adjust tinymce's media plugin not to use its SWF plugin. This changes
# 'p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"))'
# to 'false'
Patch3: wordpress-3.6-tinymce_noflash.patch
# Adjust mediaelement not to use its SWF and Silverlight plugins. This
# changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
# 'plugins:["youtube","vimeo"]'
Patch4: wordpress-3.6-mediaelement-noflash_silverlight.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@ -30,7 +46,7 @@ Requires: php53-simplepie >= 1.3.1
Requires: php >= 5.2.4
Requires: php-simplepie >= 1.3.1
%endif
# Required php extension (detected by phpci)
# Required php extension (detected by phpcompatinfo)
Requires: php-curl
Requires: php-date
Requires: php-dom
@ -60,6 +76,9 @@ Requires: php-zlib
# Unbundled libraries
Requires: php-PHPMailer
Requires: webserver
%if %{with_cacert}
Requires: ca-certificates
%endif
Provides: wordpress-mu = %{version}-%{release}
Obsoletes: wordpress-mu < 2.9.3
@ -70,8 +89,35 @@ almost trivial, to get information out to people on the web.
%prep
%setup -q -n wordpress
# Drop pre-compiled binary lumps: Flash and Silverlight
# This means that Flash video fallbacks in Wordpress' media support
# and the tinymce plugin, the plupload Flash and Silverlight
# uploaders, and swfupload are not available.
# To re-introduce these they would have to be built from the
# ActionScript source as part of this package build, they cannot be
# shipped pre-compiled. Removing plupload.flash.js and
# plupload.silverlight.js causes plupload only to try and use the html4
# or html5 uploaders; if you just wipe the binaries but leave the
# .js files, it will try and use the Flash or Silverlight uploaders
# and draw a non-functional button. - AdamW, 2013/08
# https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries
rm -f wp-includes/js/mediaelement/silverlightmediaelement.xap
rm -f wp-includes/js/mediaelement/flashmediaelement.sw
rm -f wp-includes/js/tinymce/plugins/media/moxieplayer.swf
rm -f wp-includes/js/plupload/plupload.silverlight.xap
rm -f wp-includes/js/plupload/plupload.silverlight.js
rm -f wp-includes/js/plupload/plupload.flash.swf
rm -f wp-includes/js/plupload/plupload.flash.js
# swfupload can just die in its entirety
rm -rf wp-includes/js/swfupload
%patch0 -p1 -b .dolly
#%patch1 -p1 -b .rhbz522897
%patch2 -p1
%patch3 -p1
%patch4 -p1
# disable wp_version_check, updates are always installed via rpm
sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
@ -83,9 +129,6 @@ sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \
# fix file encoding
sed -i -e 's/\r//' license.txt
# Drop .htaccess (moved in wordpress-httpd-conf)
rm wp-content/plugins/akismet/.htaccess
%build
%install
@ -125,8 +168,15 @@ for fic in phpmailer smtp; do
${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php
done
# Remove bundled ca-bundle.crt
%if %{with_cacert}
rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt
ln -s /etc/pki/tls/certs/ca-bundle.crt \
${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt
%endif
# Remove backup copies of patches
find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \
find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig \) \
-print -delete
## Move wp-content directory to /var/www location
@ -170,6 +220,11 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_sysconfdir}/wordpress
%changelog
* Fri Oct 25 2013 Remi Collet <rcollet@redhat.com> - 3.7-1
- update to 3.7
- requires ca-certificates for ca-bundle.crt
- drop pre-compiled Flash and Silverlight binaries - #1000267
* Mon Jun 24 2013 Remi Collet <rcollet@redhat.com> - 3.5.2-1
- version 3.5.2, various bug and security fixes:
CVE-2013-2173 CVE-2013-2199 CVE-2013-2200 CVE-2013-2201