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

Multiple fixes.

Browse source
This commit is contained in:
Jon Ciesla 2010-12-23 09:02:21 -06:00
commit 8ff4ce2bdf
3 changed files with 84 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
wordpress-2.8.6-r16625.patch Normal file
View file

@ -0,0 +1,11 @@
--- wp-includes/comment.php~ 2009-07-21 18:10:34.000000000 -0500
+++ wp-includes/comment.php 2010-12-23 08:55:05.433027996 -0600
@@ -1365,7 +1365,7 @@
trackback($tb_ping, $post_title, $excerpt, $post_id);
$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) );
}
}
}

60
wordpress-debian_patches_hello.patch Normal file
View file

@ -0,0 +1,60 @@
Use GPL-compliant lyrics in the hello dolly plugin
--- a/wp-content/plugins/hello.php
+++ b/wp-content/plugins/hello.php
@@ -6,42 +6,26 @@
/*
Plugin Name: Hello Dolly
Plugin URI: http://wordpress.org/#
-Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <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
Version: 1.5.1
Author URI: http://ma.tt/
*/
function hello_dolly_get_lyric() {
- /** These are the lyrics to Hello Dolly */
- $lyrics = "Hello, Dolly
-Well, hello, Dolly
-It's so nice to have you back where you belong
-You're lookin' swell, Dolly
-I can tell, Dolly
-You're still glowin', you're still crowin'
-You're still goin' strong
-We feel the room swayin'
-While the band's playin'
-One of your old favourite songs from way back when
-So, take her wrap, fellas
-Find her an empty lap, fellas
-Dolly'll never go away again
-Hello, Dolly
-Well, hello, Dolly
-It's so nice to have you back where you belong
-You're lookin' swell, Dolly
-I can tell, Dolly
-You're still glowin', you're still crowin'
-You're still goin' strong
-We feel the room swayin'
-While the band's playin'
-One of your old favourite songs from way back when
-Golly, gee, fellas
-Find her a vacant knee, fellas
-Dolly'll never go away
-Dolly'll never go away
-Dolly'll never go away again";
+ // These are the lyrics to the Free Software Song
+$lyrics = "Join us now and share the software;
+You'll be free, hackers, you'll be free.
+Hoarders may get piles of money,
+That is true, hackers, that is true.
+But they cannot help their neighbors;
+That ain't good, hackers, that ain't good.
+When we have enough free software
+At our call, hackers, at our call,
+We'll kick out those dirty licenses
+Ever more, hackers, ever more.
+Join us now and share the software;
+You'll be free, hackers, you'll be free.";
// Here we split it into lines
$lyrics = explode("\n", $lyrics);

15
wordpress.spec
View file

@ -3,13 +3,15 @@ URL: http://www.wordpress.org
Name: wordpress
Version: 2.8.6
Group: Applications/Publishing
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Source0: http://wordpress.org/%{name}-%{version}.tar.gz
Source1: wordpress-httpd-conf
Source2: README.fedora.wordpress
Patch0: wordpress-2.8.6-r16625.patch
Patch1: wordpress-debian_patches_hello.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
@ -18,6 +20,10 @@ almost trivial, to get information out to people on the web.
%prep
%setup -q -n wordpress
%patch0 -p0 -b .16625
%patch1 -p1 -b .dolly
# disable wp_version_check, updates are always installed via rpm
sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
wp-includes/update.php
@ -81,6 +87,11 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_sysconfdir}/wordpress
%changelog
* Thu Dec 23 2010 Jon Ciesla <limb@jcomserv.net> - 2.8.6-3
- Change Requires from httpd to webserver, BZ 523480.
- Patch for Hello Dolly lyrics, BZ 663966.
- Patch for security vulnerability, BZ 659319.
* Mon Nov 16 2009 Adrian Reber <adrian@lisas.de> - 2.8.6-2
- updated to 2.8.6 (Security Release)