# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1350069798 -7200
# Node ID 6f237b68bce53af09b0abdfe86f0167ca4d23582
# Parent  0db5307f7f51c039554edd2dadab01b7c1bab373
Correct mistakenly double inserted patch code and remove etc/sites,
because of the hard coded nature of Drupal and where it expects to
find domain paths corresponding to a multisite installation. The
correct path is share/sites and is already present.

diff -r 0db5307f7f51 -r 6f237b68bce5 drupal/drupal.patch
--- a/drupal/drupal.patch	Fri Oct 12 21:21:29 2012 +0200
+++ b/drupal/drupal.patch	Fri Oct 12 21:23:18 2012 +0200
@@ -79,7 +79,7 @@
 Index: modules/system/system.admin.inc
 --- modules/system/system.admin.inc.orig	2008-03-25 12:58:16 +0100
 +++ modules/system/system.admin.inc	2008-04-24 11:43:07 +0200
-@@ -1766,6 +1766,124 @@
+@@ -1766,6 +1766,165 @@
  }
  
  /**
@@ -142,65 +142,6 @@
 +}
 +
 +/**
-+ * Form builder; Configure the site proxy settings.
-+ *
-+ * @ingroup forms
-+ * @see system_settings_form()
-+ */
-+function system_proxy_settings() {
-+
-+  $form['forward_proxy'] = array(
-+    '#type' => 'fieldset',
-+    '#title' => t('Forward proxy settings'),
-+    '#description' => t('The proxy server used when Drupal needs to connect to other sites on the Internet.'),
-+  );
-+  $form['forward_proxy']['proxy_server'] = array(
-+    '#type' => 'textfield',
-+    '#title' => t('Proxy host name'),
-+    '#default_value' => variable_get('proxy_server', ''),
-+    '#description' => t('The host name of the proxy server, eg. localhost. If this is empty Drupal will connect directly to the internet.')
-+  );
-+  $form['forward_proxy']['proxy_port'] = array(
-+    '#type' => 'textfield',
-+    '#title' => t('Proxy port number'),
-+    '#default_value' => variable_get('proxy_port', 8080),
-+    '#description' => t('The port number of the proxy server, eg. 8080'),
-+  );
-+  $form['forward_proxy']['proxy_username'] = array(
-+    '#type' => 'textfield',
-+    '#title' => t('Proxy username'),
-+    '#default_value' => variable_get('proxy_username', ''),
-+    '#description' => t('The username used to authenticate with the proxy server.'),
-+  );
-+  $form['forward_proxy']['proxy_password'] = array(
-+    '#type' => 'textfield',
-+    '#title' => t('Proxy password'),
-+    '#default_value' => variable_get('proxy_password', ''),
-+    '#description' => t('The password used to connect to the proxy server. This is kept as plain text.', '')
-+  );
-+  $form['#validate'][] = 'system_proxy_settings_validate';
-+
-+  return system_settings_form($form);
-+}
-+
-+/**
-+ * Validate the submitted proxy form.
-+ */
-+function system_proxy_settings_validate($form, &$form_state) {
-+  // Validate the proxy settings
-+  $form_state['values']['proxy_server'] = trim($form_state['values']['proxy_server']);
-+  if ($form_state['values']['proxy_server'] != '') {
-+    // TCP allows the port to be between 0 and 65536 inclusive
-+    if (!is_numeric($form_state['values']['proxy_port'])) {
-+      form_set_error('proxy_port', t('The proxy port is invalid. It must be a number between 0 and 65535.'));
-+    }
-+    elseif ($form_state['values']['proxy_port'] < 0 || $form_state['values']['proxy_port'] >= 65536) {
-+      form_set_error('proxy_port', t('The proxy port is invalid. It must be between 0 and 65535.'));
-+    }
-+  }
-+}
-+
-+/**
   * Form builder; Configure the site file handling.
   *
   * @ingroup forms
diff -r 0db5307f7f51 -r 6f237b68bce5 drupal/drupal.spec
--- a/drupal/drupal.spec	Fri Oct 12 21:21:29 2012 +0200
+++ b/drupal/drupal.spec	Fri Oct 12 21:23:18 2012 +0200
@@ -109,7 +109,6 @@
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/drupal/sites \
         $RPM_BUILD_ROOT%{l_prefix}/share/drupal \
         $RPM_BUILD_ROOT%{l_prefix}/var/drupal/files \
         $RPM_BUILD_ROOT%{l_prefix}/var/drupal/run \