- updated to 4.6.5

Changed files:
    drupal-emptypass.patch -> 1.4
    drupal-replication.patch -> 1.5
    drupal.spec -> 1.45

diff --git a/drupal-emptypass.patch b/drupal-emptypass.patch
index 0fbf5c03483d9b22c2a27cc0a6a2edd796ae1aa6..8fe4943cb177d0e49f538940ba045167e9cd649d 100644 (file)
--- a/drupal-emptypass.patch
+++ b/drupal-emptypass.patch
@@ -1,23 +1,11 @@
-# without replication patch:
-#--- ./includes/database.mysql.inc~    2005-04-14 21:50:23.000000000 +0300
-#+++ ./includes/database.mysql.inc     2005-05-18 18:48:24.970031862 +0300
-#@@ -28,7 +28,7 @@
-#      $url['host'] = $url['host'] .':'. $url['port'];
-#   }
-# 
-#-  $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE) or die(mysql_error());
-#+  $connection = mysql_connect($url['host'], $url['user'], @$url['pass'], TRUE) or die(mysql_error());
-#   mysql_select_db(substr($url['path'], 1)) or die('unable to select database');
-# 
-#   return $connection;
---- ./includes/database.mysql.inc~     2005-10-28 22:32:31.000000000 +0300
-+++ ./includes/database.mysql.inc      2005-10-28 22:32:57.000000000 +0300
+--- drupal-4.6.5/includes/database.mysql.inc~  2005-12-20 12:05:30.000000000 +0200
++++ drupal-4.6.5/includes/database.mysql.inc   2005-12-20 12:06:30.000000000 +0200
 @@ -29,7 +29,7 @@
    }
  
    // For replication setups, we will assume that dieing is bad 
 -  $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE);
-+  $connection = mysql_connect($url['host'], $url['user'], @$url['pass'], TRUE);
-   if(!is_resource($connection) && $critical) {
++  $connection = mysql_connect($url['host'], $url['user'], (isset($url['pass']) ? $url['pass'] : null), TRUE);
+   if (!is_resource($connection) && $critical) {
      die(mysql_error());
    }

diff --git a/drupal-replication.patch b/drupal-replication.patch
index 8bee8c71eaab3ac535f4a74dbccd5bcc8c66af13..6b19e9a92e0ae72f556deda3bfceb276ca13add0 100644 (file)
--- a/drupal-replication.patch
+++ b/drupal-replication.patch
@@ -144,7 +144,7 @@ diff -urN drupal-4.6.0/includes/database.inc drupal-test/includes/database.inc
  
  /**
 diff -urN drupal-4.6.0/includes/database.mysql.inc drupal-test/includes/database.mysql.inc
---- drupal-4.6.0/includes/database.mysql.inc   2005-04-14 13:50:23.000000000 -0500
+--- drupal-4.6.5/includes/database.mysql.inc   2005-04-14 13:50:23.000000000 -0500
 +++ drupal-test/includes/database.mysql.inc    2005-05-29 09:28:22.490546558 -0500
 @@ -20,7 +20,7 @@
   * performance, however, when the overhead to connect to your database is high
@@ -160,18 +160,18 @@ diff -urN drupal-4.6.0/includes/database.mysql.inc drupal-test/includes/database
    }
  
 -  $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE) or die(mysql_error());
--  mysql_select_db(substr($url['path'], 1)) or die('unable to select database');
+-  mysql_select_db(substr($url['path'], 1), $connection) or die('unable to select database');
 +  // For replication setups, we will assume that dieing is bad 
-+  $connection = mysql_pconnect($url['host'], $url['user'], $url['pass'], TRUE);
-+  if(!is_resource($connection) && $critical) {
++  $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE);
++  if (!is_resource($connection) && $critical) {
 +    die(mysql_error());
 +  }
 +  // We die on bad slaves.  These should be taken care of
 +  // maybe hook this somehow or something
-+  mysql_select_db(substr($url['path'], 1)) or die(mysql_error());
++  mysql_select_db(substr($url['path'], 1), $connection) or die(mysql_error());
  
 -  return $connection;
-+  return ($connection)?$connection:false;
++  return ($connection) ? $connection : false;
  }
  
  /**
@@ -214,21 +214,6 @@ diff -urN drupal-4.6.0/includes/database.mysql.inc drupal-test/includes/database
    if (variable_get('dev_query', 0)) {
      list($usec, $sec) = explode(' ', microtime());
      $stop = (float)$usec + (float)$sec;
-@@ -67,6 +97,7 @@
-   }
- }
- 
-+
- /**
-  * Fetch one result row from the previous query as an object.
-  *
-@@ -239,4 +270,4 @@
-  * @} End of "ingroup database".
-  */
- 
--?>
-\ No newline at end of file
-+?>
 --- ./sites/default/settings.php~      2005-08-15 16:41:07.000000000 +0300
 +++ ./sites/default/settings.php       2005-08-15 16:42:47.000000000 +0300
 @@ -77,8 +77,15 @@
@@ -248,14 +233,3 @@ diff -urN drupal-4.6.0/includes/database.mysql.inc drupal-test/includes/database
  $db_prefix = '';
  
  /**
---- ./includes/database.mysql.inc~     2005-10-28 22:31:38.000000000 +0300
-+++ ./includes/database.mysql.inc      2005-10-28 22:31:53.000000000 +0300
-@@ -29,7 +29,7 @@
-   }
- 
-   // For replication setups, we will assume that dieing is bad 
--  $connection = mysql_pconnect($url['host'], $url['user'], $url['pass'], TRUE);
-+  $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE);
-   if(!is_resource($connection) && $critical) {
-     die(mysql_error());
-   }

diff --git a/drupal.spec b/drupal.spec
index 493570973e6541bdc5dad9c6f3a3afe9da61e48d..87c757059ada93f02f5661235d89412a38f2f975 100644 (file)
--- a/drupal.spec
+++ b/drupal.spec
@@ -1,14 +1,12 @@
-# TODO
-# - http://drupal.org/node/39670
 Summary:       Open source content management platform
 Summary(pl):   Platforma do zarz±dzania tre¶ci± o otwartych ¼ród³ach
 Name:          drupal
-Version:       4.6.4
-Release:       0.14
+Version:       4.6.5
+Release:       0.1
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://drupal.org/files/projects/%{name}-%{version}.tar.gz
-# Source0-md5: c61d95c766a7ff624abbe04c2430e5df
+# Source0-md5: 21e5e768d92fb6ecf52d56cacd37706e
 Source1:       %{name}.conf
 Source2:       %{name}.cron
 Source3:       %{name}.PLD
@@ -18,8 +16,6 @@ Patch2:               %{name}-topdir.patch
 Patch3:                %{name}-themedir2.patch
 Patch4:                %{name}-emptypass.patch
 Patch5:                %{name}-cron.patch
-# http://drupal.org/node/39566
-Patch6:                http://drupal.org/files/issues/check_url.patch
 URL:           http://drupal.org/
 BuildRequires: rpmbuild(macros) >= 1.264
 BuildRequires: sed >= 4.0
@@ -164,7 +160,6 @@ nazywane rozproszonym uwierzytelnianiem.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p0
 
 find -name '*~' | xargs -r rm -v
 cp -p %{SOURCE3} README.PLD