rollback to 4.7

diff --git a/drupal-6.0-scripts-noshebang.patch b/drupal-6.0-scripts-noshebang.patch
deleted file mode 100644 (file)
index a154e0c..0000000
--- a/drupal-6.0-scripts-noshebang.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
deleted file mode 100644 (file)
index cef940f..0000000
--- a/drupal-README.fedora
+++ /dev/null
@@ -1,41 +0,0 @@
-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.
-
-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

diff --git a/drupal-README.planetlab b/drupal-README.planetlab
deleted file mode 100644 (file)
index 877a067..0000000
--- a/drupal-README.planetlab
+++ /dev/null
@@ -1,18 +0,0 @@
-* started from the fedora 10 srpm 
-http://mirrors.ircam.fr/pub/fedora/linux/updates/10/SRPMS/drupal-6.7-1.fc10.src.rpm
-
-* updated specfile for
-** installing stuff directly in /var/www/html
-** compliance with module-tools
-** does not create /etc/drupal, keep everything as is under /var/www/html/sites/
-
-* defined drupal as building srpm first
-* wrote Makefile (from libnl) to fetch tarball from the drupal download area rather than ship it
-
-* removed fedora's drupal.conf; this is too conservative so we just rely on PLEWWW to provide the right
-  config as /etc/httpd/conf.d/planetlab.conf (based on former PLCWWW's drupal.conf)
-
-* patched drupal-cron to remove extra /drupal/ in path
-
-* also please note that MyPLC/plc.d/postgresql is in charge of creating the drupal db
-  in the former release (when drupal 4.7 was embedded) this script was also creating the schema, this is not the case any more

diff --git a/drupal.spec b/drupal.spec
index abbce63..197f934 100644 (file)
--- a/drupal.spec
+++ b/drupal.spec
@@ -20,12 +20,9 @@ Summary: An open-source content-management platform
 Group: Applications/Publishing
 License: GPLv2+        
 URL: http://www.drupal.org
-Source0: http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.tar.gz
+Source0: http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.%{taglevel}.tar.gz
 #Source1: drupal.conf
-Source2: drupal-README.fedora
-Source3: drupal-cron
-Source4: drupal-README.planetlab
-Patch0: drupal-6.0-scripts-noshebang.patch
+Source2: drupal-cron
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,10 +36,7 @@ configurable, skinnable, and secure.
 
 %prep
 
-%setup -q
-
-%patch0
-chmod -x scripts/drupal.sh
+%setup -q -n %{name}-%{version}.%{taglevel}
 
 %build
 
@@ -51,19 +45,8 @@ 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
-#mkdir -p %{buildroot}%{_sysconfdir}/drupal
-#mv %{buildroot}%{drupaldir}/sites/* %{buildroot}%{_sysconfdir}/drupal
-#rmdir %{buildroot}%{drupaldir}/sites
-#ln -s ../../..%{_sysconfdir}/drupal %{buildroot}%{drupaldir}/sites
 mkdir -p %{buildroot}%{_docdir}
-cp -pr %SOURCE2 .
-cp -pr %SOURCE4 .
-install -D -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/cron.hourly/drupal 
-#mkdir -p %{buildroot}%{_localstatedir}/lib/drupal
-#ln -s ../../..%{_localstatedir}/lib/drupal %{buildroot}%{drupaldir}/files
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.hourly/drupal 
 mkdir %{buildroot}%{drupaldir}/files
 
 %clean
@@ -72,7 +55,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt 
-%doc drupal-README.fedora drupal-README.planetlab sites/all/README.txt
 %{drupaldir}
 %config(noreplace) %{drupaldir}/.htaccess
 %exclude %{drupaldir}/CHANGELOG.txt
@@ -80,97 +62,8 @@ rm -rf %{buildroot}
 %exclude %{drupaldir}/LICENSE* 
 %exclude %{drupaldir}/MAINTAINERS.txt 
 %exclude %{drupaldir}/UPGRADE.txt
-#%dir %{_sysconfdir}/drupal/
-#%config(noreplace) %{_sysconfdir}/drupal/all
-%config(noreplace) %{drupaldir}/sites/all
-#%exclude %{_sysconfdir}/drupal/all/README.txt
-%exclude %{drupaldir}/sites/all/README.txt
-#%config(noreplace) %{_sysconfdir}/drupal/default
 %config(noreplace) %{drupaldir}/sites/default
-#%config(noreplace) %{_sysconfdir}/httpd/conf.d/drupal.conf
 %attr(755,root,apache) %{_sysconfdir}/cron.hourly/drupal
-#%dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 %dir %attr(775,root,apache) %{drupaldir}/files
 
 %changelog
-* Thu Dec 11 2008 Jon Ciesla <limb@jcomserv.net> - 6.7-1
-- Upgrade to 6.7, SA-2008-073.
-
-* Wed Oct 22 2008 Jon Ciesla <limb@jcomserv.net> - 6.6-1
-- Upgrade to 6.6, SA-2008-067.
-
-* Thu Oct 09 2008 Jon Ciesla <limb@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@jcomserv.net> - 6.4-1
-- Upgrade to 6.4, SA-2008-047.
-
-* Thu Jul 10 2008 Jon Ciesla <limb@jcomserv.net> - 6.3-1
-- Upgrade to 6.3, upstream security fixes, SA-2008-044.
-
-* Thu Apr 10 2008 Jon Ciesla <limb@jcomserv.net> - 6.2-1
-- Upgrade to 6.2, upstream security fixes, SA-2008-026.
-
-* Thu Feb 28 2008 Jon Ciesla <limb@jcomserv.net> - 6.1-1
-- Upgrade to 6.1, upstream security fixes, SA-2008-018.
-
-* Fri Feb 22 2008 Jon Ciesla <limb@jcomserv.net> - 6.0-1
-- Upgrade to 6.0.
-- Updated noshebang patch.
-
-* Mon Feb 04 2008 Jon Ciesla <limb@jcomserv.net> - 5.7-1
-- Upgrade to 5.7, several non-security bugs fixed.
-
-* Fri Jan 11 2008 Jon Ciesla <limb@jcomserv.net> - 5.6-1
-- Upgrade to 5.6, upstream security fixes.
-
-* Mon Jan 07 2008 Jon Ciesla <limb@jcomserv.net> - 5.5-2
-- Include .htaccess file, BZ 427720.
-
-* Mon Dec 10 2007 Jon Ciesla <limb@jcomserv.net> - 5.5-1
-- Upgrade to 5.5, critical fixes.
-
-* Thu Dec 06 2007 Jon Ciesla <limb@jcomserv.net> - 5.4-2
-- Fix /files -> /var/lib/drupal dir perms, BZ 414761.
-
-* Wed Dec 05 2007 Jon Ciesla <limb@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@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@jcomserv.net> - 5.2-3
-- Minor doc correction, BZ 301541.
-
-* Thu Aug 16 2007 Jon Ciesla <limb@jcomserv.net> - 5.2-2
-- License tag correction.
-
-* Thu Jul 26 2007 Jon Ciesla <limb@jcomserv.net> - 5.2-1
-- Upgrade to 5.2, Cross-site request forgery fix.
-
-* Fri Jul 20 2007 Jon Ciesla <limb@jcomserv.net> - 5.1-5
-- Corrected buildroot.
-- Moved /etc/drupal/all/README.txt to correct place.
-
-* Wed Jul 04 2007 Jon Ciesla <limb@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@jcomserv.net> - 5.1-3
-- Fixed initial setting.php perms.
-- Added files dir.
-
-* Wed May 30 2007 Jon Ciesla <limb@jcomserv.net> - 5.1-2
-- Fixed category, duped docs, apache restart, cron job.
-
-* Wed May 30 2007 Jon Ciesla <limb@jcomserv.net> - 5.1-1
-- Initial packaging.