OpenPKG Specs / changeset

     1.1 --- a/drupal/drupal.patch	Fri Oct 12 21:21:29 2012 +0200
     1.2 +++ b/drupal/drupal.patch	Fri Oct 12 21:23:18 2012 +0200
     1.3 @@ -79,7 +79,7 @@
     1.4  Index: modules/system/system.admin.inc
     1.5  --- modules/system/system.admin.inc.orig	2008-03-25 12:58:16 +0100
     1.6  +++ modules/system/system.admin.inc	2008-04-24 11:43:07 +0200
     1.7 -@@ -1766,6 +1766,124 @@
     1.8 +@@ -1766,6 +1766,165 @@
     1.9   }
    1.10   
    1.11   /**
    1.12 @@ -142,65 +142,6 @@
    1.13  +}
    1.14  +
    1.15  +/**
    1.16 -+ * Form builder; Configure the site proxy settings.
    1.17 -+ *
    1.18 -+ * @ingroup forms
    1.19 -+ * @see system_settings_form()
    1.20 -+ */
    1.21 -+function system_proxy_settings() {
    1.22 -+
    1.23 -+  $form['forward_proxy'] = array(
    1.24 -+    '#type' => 'fieldset',
    1.25 -+    '#title' => t('Forward proxy settings'),
    1.26 -+    '#description' => t('The proxy server used when Drupal needs to connect to other sites on the Internet.'),
    1.27 -+  );
    1.28 -+  $form['forward_proxy']['proxy_server'] = array(
    1.29 -+    '#type' => 'textfield',
    1.30 -+    '#title' => t('Proxy host name'),
    1.31 -+    '#default_value' => variable_get('proxy_server', ''),
    1.32 -+    '#description' => t('The host name of the proxy server, eg. localhost. If this is empty Drupal will connect directly to the internet.')
    1.33 -+  );
    1.34 -+  $form['forward_proxy']['proxy_port'] = array(
    1.35 -+    '#type' => 'textfield',
    1.36 -+    '#title' => t('Proxy port number'),
    1.37 -+    '#default_value' => variable_get('proxy_port', 8080),
    1.38 -+    '#description' => t('The port number of the proxy server, eg. 8080'),
    1.39 -+  );
    1.40 -+  $form['forward_proxy']['proxy_username'] = array(
    1.41 -+    '#type' => 'textfield',
    1.42 -+    '#title' => t('Proxy username'),
    1.43 -+    '#default_value' => variable_get('proxy_username', ''),
    1.44 -+    '#description' => t('The username used to authenticate with the proxy server.'),
    1.45 -+  );
    1.46 -+  $form['forward_proxy']['proxy_password'] = array(
    1.47 -+    '#type' => 'textfield',
    1.48 -+    '#title' => t('Proxy password'),
    1.49 -+    '#default_value' => variable_get('proxy_password', ''),
    1.50 -+    '#description' => t('The password used to connect to the proxy server. This is kept as plain text.', '')
    1.51 -+  );
    1.52 -+  $form['#validate'][] = 'system_proxy_settings_validate';
    1.53 -+
    1.54 -+  return system_settings_form($form);
    1.55 -+}
    1.56 -+
    1.57 -+/**
    1.58 -+ * Validate the submitted proxy form.
    1.59 -+ */
    1.60 -+function system_proxy_settings_validate($form, &$form_state) {
    1.61 -+  // Validate the proxy settings
    1.62 -+  $form_state['values']['proxy_server'] = trim($form_state['values']['proxy_server']);
    1.63 -+  if ($form_state['values']['proxy_server'] != '') {
    1.64 -+    // TCP allows the port to be between 0 and 65536 inclusive
    1.65 -+    if (!is_numeric($form_state['values']['proxy_port'])) {
    1.66 -+      form_set_error('proxy_port', t('The proxy port is invalid. It must be a number between 0 and 65535.'));
    1.67 -+    }
    1.68 -+    elseif ($form_state['values']['proxy_port'] < 0 || $form_state['values']['proxy_port'] >= 65536) {
    1.69 -+      form_set_error('proxy_port', t('The proxy port is invalid. It must be between 0 and 65535.'));
    1.70 -+    }
    1.71 -+  }
    1.72 -+}
    1.73 -+
    1.74 -+/**
    1.75    * Form builder; Configure the site file handling.
    1.76    *
    1.77    * @ingroup forms

     2.1 --- a/drupal/drupal.spec	Fri Oct 12 21:21:29 2012 +0200
     2.2 +++ b/drupal/drupal.spec	Fri Oct 12 21:23:18 2012 +0200
     2.3 @@ -109,7 +109,6 @@
     2.4      %{l_shtool} mkdir -f -p -m 755 \
     2.5          $RPM_BUILD_ROOT%{l_prefix}/sbin \
     2.6          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
     2.7 -        $RPM_BUILD_ROOT%{l_prefix}/etc/drupal/sites \
     2.8          $RPM_BUILD_ROOT%{l_prefix}/share/drupal \
     2.9          $RPM_BUILD_ROOT%{l_prefix}/var/drupal/files \
    2.10          $RPM_BUILD_ROOT%{l_prefix}/var/drupal/run \