[drupal6/el5/master] Initial manual import.
Jon Ciesla
limb at fedoraproject.org
Thu Sep 23 17:53:49 UTC 2010
commit b323bee9a7b4e48d0afc02465b97af230b8d07b3
Author: Jon Ciesla <limb at jcomserv.net>
Date: Thu Sep 23 12:53:36 2010 -0500
Initial manual import.
.gitignore | 1 +
drupal-6.0-scripts-noshebang.patch | 40 +++++++
drupal-README.fedora | 73 ++++++++++++
drupal-files-migrator.sh | 7 +
drupal6-cron | 2 +
drupal6-files-migrator.sh | 7 +
drupal6.conf | 17 +++
drupal6.spec | 213 ++++++++++++++++++++++++++++++++++++
sources | 1 +
9 files changed, 361 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c9ac1b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+drupal-6.19.tar.gz
\ No newline at end of file
diff --git a/drupal-6.0-scripts-noshebang.patch b/drupal-6.0-scripts-noshebang.patch
new file mode 100644
index 0000000..a154e0c
--- /dev/null
+++ b/drupal-6.0-scripts-noshebang.patch
@@ -0,0 +1,40 @@
+diff -u scripts/code-clean.sh scripts.new/code-clean.sh
+--- scripts/code-clean.sh 2008-02-22 07:37:31.000000000 -0600
++++ scripts.new/code-clean.sh 2008-02-22 07:37:31.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # $Id: code-clean.sh,v 1.8 2005/08/11 13:02:08 dries Exp $
+
+ find . -name "*~" -type f | xargs rm -f
+diff -u scripts/code-style.pl scripts.new/code-style.pl
+--- scripts/code-style.pl 2008-02-22 07:37:57.000000000 -0600
++++ scripts.new/code-style.pl 2008-02-22 07:37:57.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/perl -w
+ # $Id: code-style.pl,v 1.14 2007/02/15 11:40:19 dries Exp $
+
+ use Pod::Usage;
+diff -u scripts/cron-curl.sh scripts.new/cron-curl.sh
+--- scripts/cron-curl.sh 2008-02-22 07:38:04.000000000 -0600
++++ scripts.new/cron-curl.sh 2008-02-22 07:38:04.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # $Id: cron-curl.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
+
+ curl --silent --compressed http://example.com/cron.php
+diff -u scripts/cron-lynx.sh scripts.new/cron-lynx.sh
+--- scripts/cron-lynx.sh 2008-02-22 07:38:09.000000000 -0600
++++ scripts.new/cron-lynx.sh 2008-02-22 07:38:09.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # $Id: cron-lynx.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
+
+ /usr/bin/lynx -source http://example.com/cron.php > /dev/null 2>&1
+diff -u scripts/drupal.sh scripts.new/drupal.sh
+--- scripts/drupal.sh 2008-02-22 07:38:17.000000000 -0600
++++ scripts.new/drupal.sh 2008-02-22 07:38:17.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/php
+ <?php
+ // $Id: drupal.sh,v 1.4 2007/07/02 14:41:37 dries Exp $
+
diff --git a/drupal-README.fedora b/drupal-README.fedora
new file mode 100644
index 0000000..07e2c1e
--- /dev/null
+++ b/drupal-README.fedora
@@ -0,0 +1,73 @@
+Initially upon install, Drupal requires two additional installation steps:
+
+1. DB setup
+
+To begin with, install php-mysql or php-pgsql, depending on which db backend
+you intend to use.
+
+Then, follow the installation instructions in INSTALL.*.txt to complete the
+setup of and connection of Drupal to the required database, including chmod
+666 on /etc/drupal/default/settings.php, uncommenting the appropriate line in
+/etc/httpd/conf.d/drupal.conf, and restarting httpd.
+
+Once these steps have been completed, you should be ready to connect to http://yourhost/drupal
+to complete the initial setup.
+
+Remember to change the /etc/drupal/default/settings.php permissions back to
+644 when you've finished the initial setup.
+
+2. Enable remote access
+
+Drupal ships in Fedora with all non-localhost access disabled. Comment and
+uncomment lines in /etc/httpd/conf.d/drupal.conf as appropriate, and restart
+httpd.
+
+Regarding the file layout:
+Pay careful attention to the placement of the directories as established by
+the package. If you need to relocate files due to size, for custom modules
+not included in Fedora, or for large custom site data, be careful to do so
+without altering any of the symlinks owned by the package. Most configurations
+should not run into problems, but if any symlinks are changed, they will be
+re-written when the package is upgraded, which could break the site until
+you re-change the symlink.
+
+2a. SELinux configuration
+
+If running with SELinux in Enforcing mode, you'll need run the following to allow drupal
+to send mail from httpd using sendmail:
+
+/usr/sbin/setsebool -P httpd_can_sendmail 1
+
+3. SSL/TLS usage.
+CVE-2008-3661 relates to the security of session cookies and SSL/TLS.
+
+http://int21.de/cve/CVE-2008-3661-drupal.html
+http://www.securityfocus.com/bid/31285
+
+To help mitigate this, uncomment the following line in /etc/httpd/conf.d/drupal.conf:
+#php_flag session.cookie_secure on
+
+
+4. Upgrading
+
+Prior to upgrading to a new version, log into each site with the first/admin user,
+upgrade the rpm, and then run the database upgrader by navigating to
+http://site/update.php.
+
+If upgrading to version 6.9-2 or later, please note that
+the locations for the sites' files directories has changed, and that you'll need
+to move them and symlink accordingly. A script is included in the doc folder:
+/usr/share/drupal-VERSION/drupal-files-migrator.sh. Please use this script as a
+guideline for the changes you'll need to make.
+
+Essentially, the site folders will stay in /etc/drupal, but from there the files folders
+will be moved to /var/lib/drupal/files/SITENAME, and symlinked accordingly. This is done
+for SELinux reasons, see https://bugzilla.redhat.com/show_bug.cgi?id=472642.
+
+Patches to the script are welcome!
+
+5. Modules
+
+There are some drupal modules in Fedora. These will install in
+/usr/share/drupal/modules, and you should install your modules there as well.
+
diff --git a/drupal-files-migrator.sh b/drupal-files-migrator.sh
new file mode 100644
index 0000000..f4f08d5
--- /dev/null
+++ b/drupal-files-migrator.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+cd /etc/drupal
+for i in `ls -1`; do
+mv $i/files /var/lib/drupal/files/$i
+/sbin/restorecon /var/lib/drupal/files/$i
+ln -s /var/lib/drupal/files/$i /etc/drupal/$i/files
+done
diff --git a/drupal6-cron b/drupal6-cron
new file mode 100644
index 0000000..a826edb
--- /dev/null
+++ b/drupal6-cron
@@ -0,0 +1,2 @@
+#!/bin/sh
+wget -O - -q http://localhost/drupal6/cron.php
diff --git a/drupal6-files-migrator.sh b/drupal6-files-migrator.sh
new file mode 100644
index 0000000..5586164
--- /dev/null
+++ b/drupal6-files-migrator.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+cd /etc/drupal6
+for i in `ls -1`; do
+mv $i/files /var/lib/drupal6/files/$i
+/sbin/restorecon /var/lib/drupal6/files/$i
+ln -s /var/lib/drupal6/files/$i /etc/drupal6/$i/files
+done
diff --git a/drupal6.conf b/drupal6.conf
new file mode 100644
index 0000000..cac1a9b
--- /dev/null
+++ b/drupal6.conf
@@ -0,0 +1,17 @@
+#
+# Drupal is an open-source content-management platform.
+#
+
+Alias /drupal /usr/share/drupal6
+
+<Directory /usr/share/drupal6/>
+ Order Deny,Allow
+ #Comment the following line and uncomment the next for public use
+ Deny from all
+ #Allow from all
+ #Uncomment the following line for setup
+ #Allow from 127.0.0.1
+ AllowOverride All
+ #Uncomment the next line if using with SSL/TLS
+ #php_flag session.cookie_secure on
+</Directory>
diff --git a/drupal6.spec b/drupal6.spec
new file mode 100644
index 0000000..1b2e8e9
--- /dev/null
+++ b/drupal6.spec
@@ -0,0 +1,213 @@
+%define drupaldir %{_datadir}/drupal6
+Name: drupal6
+Version: 6.19
+Release: 1%{?dist}
+Summary: An open-source content-management platform
+
+Group: Applications/Publishing
+License: GPL+
+URL: http://www.drupal.org
+Source0: http://ftp.osuosl.org/pub/drupal/files/projects/drupal-%{version}.tar.gz
+Source1: %{name}.conf
+Source2: drupal-README.fedora
+Source3: %{name}-cron
+Source4: drupal-files-migrator.sh
+Patch0: drupal-6.0-scripts-noshebang.patch
+
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: php, php-gd, php-mbstring, wget
+
+%description
+Equipped with a powerful blend of features, Drupal is a Content Management
+System written in PHP that can support a variety of websites ranging from
+personal weblogs to large community-driven websites. Drupal is highly
+configurable, skinnable, and secure.
+
+%prep
+
+%setup -q -n drupal-%{version}
+
+%patch0
+chmod -x scripts/drupal.sh
+
+%build
+
+%install
+rm -rf %{buildroot}
+install -d %{buildroot}%{drupaldir}
+cp -pr * %{buildroot}%{drupaldir}
+cp -pr .htaccess %{buildroot}%{drupaldir}
+mkdir -p %{buildroot}%{_sysconfdir}/httpd
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+cp -pr %SOURCE1 %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
+mv %{buildroot}%{drupaldir}/sites/* %{buildroot}%{_sysconfdir}/%{name}
+rmdir %{buildroot}%{drupaldir}/sites
+ln -s ../../..%{_sysconfdir}/%{name} %{buildroot}%{drupaldir}/sites
+mkdir -p %{buildroot}%{_docdir}
+cp -pr %SOURCE2 .
+install -D -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/files/default
+ln -s ../../..%{_localstatedir}/lib/%{name}/files/default %{buildroot}%{_sysconfdir}/%{name}/default/files
+cp -pr %SOURCE4 .
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+mv %{buildroot}%{drupaldir}/.htaccess %{buildroot}%{_sysconfdir}/httpd/conf.d/drupal6-site.htaccess
+ln -s ../../../%{_sysconfdir}/httpd/conf.d/drupal6-site.htaccess %{buildroot}%{drupaldir}/.htaccess
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt drupal-README.fedora sites/all/README.txt drupal-files-migrator.sh
+%{drupaldir}
+%exclude %{drupaldir}/CHANGELOG.txt
+%exclude %{drupaldir}/INSTALL*
+%exclude %{drupaldir}/LICENSE*
+%exclude %{drupaldir}/MAINTAINERS.txt
+%exclude %{drupaldir}/UPGRADE.txt
+%dir %{_sysconfdir}/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/all
+%exclude %{_sysconfdir}/%{name}/all/README.txt
+%config(noreplace) %{_sysconfdir}/%{name}/default
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}*.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}*.htaccess
+%attr(755,root,apache) %config(noreplace) %{_sysconfdir}/cron.hourly/%{name}
+%dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/
+%dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/files/
+%dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/files/default/
+
+%changelog
+* Thu Aug 12 2010 Jon Ciesla <limb at jcomserv.net> - 6.19-1
+- Update to 6.19, SA-CORE-2010-002.
+- Moved .htaccess to /etc/httpd/conf.d/drupal6-site.htaccess and symlinked, per review.
+
+* Tue Jul 13 2010 Jon Ciesla <limb at jcomserv.net> - 6.17-2
+- Fixed license tag.
+
+* Mon Jun 28 2010 Jon Ciesla <limb at jcomserv.net> - 6.17-1
+- Update to 6.17, review fixes.
+
+* Mon Mar 08 2010 Jon Ciesla <limb at jcomserv.net> - 6.16-1
+- Update to 6.16, SA-CORE-2010-001.
+
+* Thu Dec 17 2009 Jon Ciesla <limb at jcomserv.net> - 6.15-1
+- Update to 6.15, SA-CORE-2009-009.
+
+* Wed Sep 16 2009 Jon Ciesla <limb at jcomserv.net> - 6.14-1
+- Update to 6.14, SA-CORE-2009-008.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 02 2009 Jon Ciesla <limb at jcomserv.net> - 6.13-1
+- Update to 6.11, SA-CORE-2009-007.
+- Added clarifying text on module installation to readme, BZ 500707.
+
+* Thu May 14 2009 Jon Ciesla <limb at jcomserv.net> - 6.12-1
+- Update to 6.11, SA-CORE-2009-006.
+
+* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net> - 6.11-1
+- Update to 6.11, SA-CORE-2009-005.
+
+* Mon Apr 27 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-2
+- Added SELinux/sendmail note to README, BZ 497642.
+
+* Thu Feb 26 2009 Jon Ciesla <limb at jcomserv.net> - 6.10-1
+- Update to 6.10, SA-CORE-2009-003.
+
+* Tue Feb 17 2009 Jon Ciesla <limb at jcomserv.net> - 6.9-2
+- Drop pre script for files move, 472642.
+- Updated drupal-README.fedora.
+- Mark cron job noreplace, BZ 485567.
+
+* Thu Jan 15 2009 Jon Ciesla <limb at jcomserv.net> - 6.9-1
+- Upgrade to 6.9, SA-CORE-2009-001.
+
+* Fri Jan 02 2009 Jon Ciesla <limb at jcomserv.net> - 6.8-1
+- Upgrade to 6.8.
+- Move files directories from sites to /var/lib/drupal/files/N for selinux reasons, 472642.
+- Included script to move files outside of default, use at your own risk, patches welcome.
+
+* Thu Dec 11 2008 Jon Ciesla <limb at jcomserv.net> - 6.7-1
+- Upgrade to 6.7, SA-2008-073.
+
+* Wed Oct 22 2008 Jon Ciesla <limb at jcomserv.net> - 6.6-1
+- Upgrade to 6.6, SA-2008-067.
+
+* Thu Oct 09 2008 Jon Ciesla <limb at jcomserv.net> - 6.5-1
+- Upgrade to 6.5, SA-2008-060.
+- Added notes to README and drupal.conf re CVE-2008-3661.
+
+* Thu Aug 14 2008 Jon Ciesla <limb at jcomserv.net> - 6.4-1
+- Upgrade to 6.4, SA-2008-047.
+
+* Thu Jul 10 2008 Jon Ciesla <limb at jcomserv.net> - 6.3-1
+- Upgrade to 6.3, upstream security fixes, SA-2008-044.
+
+* Thu Apr 10 2008 Jon Ciesla <limb at jcomserv.net> - 6.2-1
+- Upgrade to 6.2, upstream security fixes, SA-2008-026.
+
+* Thu Feb 28 2008 Jon Ciesla <limb at jcomserv.net> - 6.1-1
+- Upgrade to 6.1, upstream security fixes, SA-2008-018.
+
+* Fri Feb 22 2008 Jon Ciesla <limb at jcomserv.net> - 6.0-1
+- Upgrade to 6.0.
+- Updated noshebang patch.
+
+* Mon Feb 04 2008 Jon Ciesla <limb at jcomserv.net> - 5.7-1
+- Upgrade to 5.7, several non-security bugs fixed.
+
+* Fri Jan 11 2008 Jon Ciesla <limb at jcomserv.net> - 5.6-1
+- Upgrade to 5.6, upstream security fixes.
+
+* Mon Jan 07 2008 Jon Ciesla <limb at jcomserv.net> - 5.5-2
+- Include .htaccess file, BZ 427720.
+
+* Mon Dec 10 2007 Jon Ciesla <limb at jcomserv.net> - 5.5-1
+- Upgrade to 5.5, critical fixes.
+
+* Thu Dec 06 2007 Jon Ciesla <limb at jcomserv.net> - 5.4-2
+- Fix /files -> /var/lib/drupal dir perms, BZ 414761.
+
+* Wed Dec 05 2007 Jon Ciesla <limb at jcomserv.net> - 5.4-1
+- Upgrade to 5.4, advisory ID DRUPAL-SA-2007-031.
+- Augmented README regarding symlinks, BZ 254228.
+
+* Thu Oct 18 2007 Jon Ciesla <limb at jcomserv.net> - 5.3-1
+- Upgrade to 5.3, fixes:
+- HTTP response splitting.
+- Arbitrary code execution.
+- Cross-site scripting.
+- Cross-site request forgery.
+- Access bypass.
+
+* Mon Sep 24 2007 Jon Ciesla <limb at jcomserv.net> - 5.2-3
+- Minor doc correction, BZ 301541.
+
+* Thu Aug 16 2007 Jon Ciesla <limb at jcomserv.net> - 5.2-2
+- License tag correction.
+
+* Thu Jul 26 2007 Jon Ciesla <limb at jcomserv.net> - 5.2-1
+- Upgrade to 5.2, Cross-site request forgery fix.
+
+* Fri Jul 20 2007 Jon Ciesla <limb at jcomserv.net> - 5.1-5
+- Corrected buildroot.
+- Moved /etc/drupal/all/README.txt to correct place.
+
+* Wed Jul 04 2007 Jon Ciesla <limb at jcomserv.net> - 5.1-4
+- Made settings.php not readonly by default, with note in drupal-README.fedora
+- Locked down initial security configuration, documented steps required.
+- Description cleanup.
+- Added wget requires.
+
+* Wed Jun 06 2007 Jon Ciesla <limb at jcomserv.net> - 5.1-3
+- Fixed initial setting.php perms.
+- Added files dir.
+
+* Wed May 30 2007 Jon Ciesla <limb at jcomserv.net> - 5.1-2
+- Fixed category, duped docs, apache restart, cron job.
+
+* Wed May 30 2007 Jon Ciesla <limb at jcomserv.net> - 5.1-1
+- Initial packaging.
diff --git a/sources b/sources
index e69de29..394cafe 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f47f77f4cfb41b1c3847ff4a64ee9279 drupal-6.19.tar.gz
More information about the scm-commits
mailing list