Author: glen Date: Tue May 4 15:34:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated source/patches for 6.16; untested
---- Files affected:
packages/drupal:
drupal-cron.patch (1.6 -> 1.7) , drupal-topdir.patch (1.5 -> 1.6) ,
drupal.spec (1.81 -> 1.82) , drupal-themedir2.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/drupal/drupal-cron.patch
diff -u packages/drupal/drupal-cron.patch:1.6
packages/drupal/drupal-cron.patch:1.7
--- packages/drupal/drupal-cron.patch:1.6 Tue May 4 17:13:55 2010
+++ packages/drupal/drupal-cron.patch Tue May 4 17:34:36 2010
@@ -20,42 +20,16 @@
include_once './includes/bootstrap.inc';
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
drupal_cron_run();
-diff -uNdr drupal-5.7.old/includes/bootstrap.inc
drupal-5.7/includes/bootstrap.inc
---- drupal-5.7.old/includes/bootstrap.inc 2008-01-10 23:14:24.000000000
+0100
-+++ drupal-5.7/includes/bootstrap.inc 2008-02-16 16:02:23.000000000 +0100
-@@ -201,7 +201,7 @@
+--- drupal-6.16/includes/bootstrap.inc~ 2010-05-04 18:27:27.000000000
+0300
++++ drupal-6.16/includes/bootstrap.inc 2010-05-04 18:31:49.802495730 +0300
+@@ -318,8 +318,8 @@
+ $_SERVER['HTTP_HOST'] = '';
+ }
+
+- if (file_exists('./'. conf_path() .'/settings.php')) {
+- include_once './'. conf_path() .'/settings.php';
++ if (file_exists(conf_path() .'/settings.php')) {
++ include_once conf_path() .'/settings.php';
+ }
- $confdir = 'sites';
- $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] :
$_SERVER['SCRIPT_FILENAME']);
-- $server = explode('.', implode('.', array_reverse(explode(':',
rtrim($_SERVER['HTTP_HOST'], '.')))));
-+ $server = explode('.', implode('.', array_reverse(explode(':',
rtrim(@$_SERVER['HTTP_HOST'], '.')))));
- for ($i = count($uri) - 1; $i > 0; $i--) {
- for ($j = count($server); $j > 0; $j--) {
- $dir = implode('.', array_slice($server, -$j)) . implode('.',
array_slice($uri, 0, $i));
-@@ -240,7 +240,7 @@
- global $db_url, $db_prefix, $cookie_domain, $conf, $installed_profile;
- $conf = array();
-
-- include_once './'. conf_path() .'/settings.php';
-+ include_once conf_path() .'/settings.php';
-
- if (isset($base_url)) {
- // Parse fixed base URL from settings.php.
-@@ -258,7 +258,7 @@
-
- // As $_SERVER['HTTP_HOST'] is user input, ensure it only contains
- // characters allowed in hostnames.
-- $base_url = $base_root .= '://'. preg_replace('/[^a-z0-9-:._]/i', '',
$_SERVER['HTTP_HOST']);
-+ $base_url = $base_root .= '://'. preg_replace('/[^a-z0-9-:._]/i', '',
@$_SERVER['HTTP_HOST']);
-
- // $_SERVER['SCRIPT_NAME'] can, in contrast to $_SERVER['PHP_SELF'], not
- // be modified by a visitor.
-@@ -886,7 +886,7 @@
-
- case DRUPAL_BOOTSTRAP_ACCESS:
- // Deny access to hosts which were banned - t() is not yet available.
-- if (drupal_is_denied('host', $_SERVER['REMOTE_ADDR'])) {
-+ if (drupal_is_denied('host', @$_SERVER['REMOTE_ADDR'])) {
- header('HTTP/1.1 403 Forbidden');
- print 'Sorry, '. $_SERVER['REMOTE_ADDR']. ' has been banned.';
- exit();
+ // Ignore the placeholder url from default.settings.php.
================================================================
Index: packages/drupal/drupal-topdir.patch
diff -u packages/drupal/drupal-topdir.patch:1.5
packages/drupal/drupal-topdir.patch:1.6
--- packages/drupal/drupal-topdir.patch:1.5 Tue May 4 17:13:55 2010
+++ packages/drupal/drupal-topdir.patch Tue May 4 17:34:36 2010
@@ -18,13 +18,13 @@
include_once './includes/bootstrap.inc';
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
include_once './includes/xmlrpc.inc';
---- drupal-5.7/update.php.old 2007-04-08 02:54:04.000000000 +0200
-+++ drupal-5.7/update.php 2008-02-17 21:15:36.000000000 +0100
-@@ -765,6 +765,7 @@
+--- drupal-6.16/update.php~ 2010-05-04 18:32:33.000000000 +0300
++++ drupal-6.16/update.php 2010-05-04 18:32:53.539378793 +0300
+@@ -563,6 +563,7 @@
// Our custom error handler is not yet installed, so we just suppress them.
ini_set('display_errors', FALSE);
+chdir('..');
- include_once './includes/bootstrap.inc';
- update_fix_system_table();
+ require_once './includes/bootstrap.inc';
+ // We only load DRUPAL_BOOTSTRAP_CONFIGURATION for the update requirements
================================================================
Index: packages/drupal/drupal.spec
diff -u packages/drupal/drupal.spec:1.81 packages/drupal/drupal.spec:1.82
--- packages/drupal/drupal.spec:1.81 Tue May 4 17:26:07 2010
+++ packages/drupal/drupal.spec Tue May 4 17:34:36 2010
@@ -1,25 +1,22 @@
# $Revision$, $Date$
-# TODO
-# - why not drupal 6.0?
Summary: Open source content management platform
Summary(pl.UTF-8): Platforma do zarządzania treścią o otwartych źródłach
Name: drupal
-Version: 5.7
-Release: 0.4
+Version: 6.16
+Release: 0.1
License: GPL
Group: Applications/WWW
-Source0:
http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.tar.gz
-# Source0-md5: c7d9911ad1001c790bbdfe6fd4cdfc89
+Source0: http://ftp.drupal.org/files/projects/%{name}-%{version}.tar.gz
+# Source0-md5: bb27c1f90680b86df2c535b2d52e8021
Source1: %{name}.conf
Source2: %{name}.cron
Source3: %{name}.PLD
Patch0: %{name}-cron.patch
Patch1: %{name}-sitesdir.patch
Patch2: %{name}-topdir.patch
-Patch3: %{name}-themedir2.patch
#Patchx: %{name}-replication.patch
#Patchx: %{name}-emptypass.patch
-URL: http://drupal.org/
+URL: http://www.drupal.org/
BuildRequires: rpmbuild(macros) >= 1.264
BuildRequires: sed >= 4.0
Requires: %{name}(DB_Driver) = %{version}-%{release}
@@ -165,7 +162,6 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
# cleanup backups after patching
find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -314,6 +310,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.82 2010/05/04 15:34:36 glen
+- updated source/patches for 6.16; untested
+
Revision 1.81 2010/05/04 15:26:07 glen
- merge drupal-apache1.conf back to main apache config, i don't see what is
that different that needs extra file
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal-cron.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal-topdir.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal.spec?r1=1.81&r2=1.82&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
