summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Bainter2010-04-09 13:34:23 -0500
committerGeorge Sherwood2010-05-03 20:03:49 -0500
commit01d5e388379fef71604b2d3a6a6d21fd29ce4751 (patch)
treeeec07b45f100469dd11e16910167b36772e1ed7f
parent7a88fdb3afa6765fa4cd28f857738f8723bca28f (diff)
http/apache: apache deprecated and renamed to apache1 for Bug #13532
-rw-r--r--ChangeLog3
-rwxr-xr-xhttp/apache/BUILD14
-rwxr-xr-xhttp/apache/DEPENDS7
-rwxr-xr-xhttp/apache/DETAILS29
-rwxr-xr-xhttp/apache/DOWNLOAD1
-rw-r--r--http/apache/HISTORY6
-rwxr-xr-xhttp/apache/INSTALL1
-rwxr-xr-xhttp/apache/PRE_BUILD4
-rwxr-xr-xhttp/apache/TRIGGERS1
-rwxr-xr-xhttp/apache1/BUILD13
-rwxr-xr-xhttp/apache1/CONFLICTS (renamed from http/apache/CONFLICTS)1
-rwxr-xr-xhttp/apache1/DEPENDS6
-rwxr-xr-xhttp/apache1/DETAILS22
-rw-r--r--http/apache1/HISTORY153
-rwxr-xr-xhttp/apache1/PRE_BUILD3
-rwxr-xr-xhttp/apache1/PROVIDES (renamed from http/apache/PROVIDES)0
-rw-r--r--http/apache1/apache_1.3.41_glic.patch (renamed from http/apache/apache_1.3.41_glic.patch)0
-rwxr-xr-xhttp/apache1/init.d/apache (renamed from http/apache/init.d/apache)0
18 files changed, 220 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ce740ea92..cc415444de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-10 Mark Bainter <mbainter@sourcemage.org>
+ * http/apache: spell deprecated [renamed to apache1] for Bug #13532
+
2010-04-01 Arjan Bouter <abouter@sourcemage.org>
* spelling/mythes: new spell, thesaurus library
diff --git a/http/apache/BUILD b/http/apache/BUILD
index 210aa41c18..27ba77ddaf 100755
--- a/http/apache/BUILD
+++ b/http/apache/BUILD
@@ -1,13 +1 @@
-./configure --prefix=/usr \
- --sysconfdir=/etc/httpd \
- --localstatedir=/var \
- --logfiledir=/var/log/httpd \
- --proxycachedir=/var/cache/httpd \
- --runtimedir=/var/run/httpd \
- --enable-module=most \
- --enable-shared=max \
- --enable-module=mmap_static \
- --disable-module=auth_dbm \
- --with-layout=GNU \
- $OPTS &&
-make
+true
diff --git a/http/apache/DEPENDS b/http/apache/DEPENDS
index 6e63efc0d1..4410a52d1e 100755
--- a/http/apache/DEPENDS
+++ b/http/apache/DEPENDS
@@ -1,6 +1 @@
-optional_depends db '--enable-module=auth_db' '--disable-module=auth_db' 'for Berekely DB support' &&
-
-optional_depends 'gdbm' \
- '--enable-module=rewrite' \
- '--disable-module=rewrite' \
- 'for extensible hasing database routines'
+depends apache
diff --git a/http/apache/DETAILS b/http/apache/DETAILS
index 76206dfe9b..e8221ef3b1 100755
--- a/http/apache/DETAILS
+++ b/http/apache/DETAILS
@@ -1,22 +1,7 @@
- SPELL=apache
- VERSION=1.3.41
- SECURITY_PATCH=3
- SOURCE=${SPELL}_$VERSION.tar.gz
- SOURCE2=$SOURCE.asc
- SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
- SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
- SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
- SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
- SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2
- SOURCE2_IGNORE=signature
- LICENSE[0]=APACHE
- WEB_SITE=http://httpd.apache.org/
- KEYWORDS="http"
- ENTERED=20010922
- SHORT="Apache HTTP Server"
-cat << EOF
-Apache is the world's most popular HTTP server, being quite possibly
-the best around in terms of functionality, efficiency, security and
-speed.
-EOF
+ SPELL=apache
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by apache1]
+ EOF
diff --git a/http/apache/DOWNLOAD b/http/apache/DOWNLOAD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/http/apache/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/http/apache/HISTORY b/http/apache/HISTORY
index 9e713efbed..3c18bfbdca 100644
--- a/http/apache/HISTORY
+++ b/http/apache/HISTORY
@@ -1,3 +1,9 @@
+2010-03-23 Mark Bainter <mbainter@sourcemage.org>
+ * spell deprecated [renamed to apache1]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+ * Deprecated in preparation for turning apache into profile spell (Bug #13532)
+
2009-09-04 Quentin Rameau <quinq@sourcemage.org>
* PRE_BUILD, apache_1.3.41_glic.patch: added, glibc 2.10 compatibility
diff --git a/http/apache/INSTALL b/http/apache/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/http/apache/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/http/apache/PRE_BUILD b/http/apache/PRE_BUILD
index 42fa815351..27ba77ddaf 100755
--- a/http/apache/PRE_BUILD
+++ b/http/apache/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/apache_1.3.41_glic.patch
+true
diff --git a/http/apache/TRIGGERS b/http/apache/TRIGGERS
new file mode 100755
index 0000000000..a2943e51d3
--- /dev/null
+++ b/http/apache/TRIGGERS
@@ -0,0 +1 @@
+on_cast apache dispel_self
diff --git a/http/apache1/BUILD b/http/apache1/BUILD
new file mode 100755
index 0000000000..210aa41c18
--- /dev/null
+++ b/http/apache1/BUILD
@@ -0,0 +1,13 @@
+./configure --prefix=/usr \
+ --sysconfdir=/etc/httpd \
+ --localstatedir=/var \
+ --logfiledir=/var/log/httpd \
+ --proxycachedir=/var/cache/httpd \
+ --runtimedir=/var/run/httpd \
+ --enable-module=most \
+ --enable-shared=max \
+ --enable-module=mmap_static \
+ --disable-module=auth_dbm \
+ --with-layout=GNU \
+ $OPTS &&
+make
diff --git a/http/apache/CONFLICTS b/http/apache1/CONFLICTS
index 9507f3fb53..6f5fbf01ad 100755
--- a/http/apache/CONFLICTS
+++ b/http/apache1/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts apache &&
conflicts apache-mod_ssl &&
conflicts apache2 &&
conflicts apache22 &&
diff --git a/http/apache1/DEPENDS b/http/apache1/DEPENDS
new file mode 100755
index 0000000000..6e63efc0d1
--- /dev/null
+++ b/http/apache1/DEPENDS
@@ -0,0 +1,6 @@
+optional_depends db '--enable-module=auth_db' '--disable-module=auth_db' 'for Berekely DB support' &&
+
+optional_depends 'gdbm' \
+ '--enable-module=rewrite' \
+ '--disable-module=rewrite' \
+ 'for extensible hasing database routines'
diff --git a/http/apache1/DETAILS b/http/apache1/DETAILS
new file mode 100755
index 0000000000..76206dfe9b
--- /dev/null
+++ b/http/apache1/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=apache
+ VERSION=1.3.41
+ SECURITY_PATCH=3
+ SOURCE=${SPELL}_$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
+ SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
+ SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
+ SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
+ SOURCE2_URL[1]=http://www.apache.org/dist/httpd/$SOURCE2
+ SOURCE2_IGNORE=signature
+ LICENSE[0]=APACHE
+ WEB_SITE=http://httpd.apache.org/
+ KEYWORDS="http"
+ ENTERED=20010922
+ SHORT="Apache HTTP Server"
+cat << EOF
+Apache is the world's most popular HTTP server, being quite possibly
+the best around in terms of functionality, efficiency, security and
+speed.
+EOF
diff --git a/http/apache1/HISTORY b/http/apache1/HISTORY
new file mode 100644
index 0000000000..c2c54c1b9d
--- /dev/null
+++ b/http/apache1/HISTORY
@@ -0,0 +1,153 @@
+2010-03-23 Mark Bainter <mbainter@sourcemage.org>
+ * Renamed from apache to apache1
+ * CONFLICTS: added apache (deprecated)
+
+2009-09-04 Quentin Rameau <quinq@sourcemage.org>
+ * PRE_BUILD, apache_1.3.41_glic.patch: added, glibc 2.10 compatibility
+
+2008-05-27 Remko van der Vossen <wich@sourcemage.org>
+ * CONFLICTS: conflict with xshttpd if that is compiled without prefix
+
+2008-01-25 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Optionally depend on gdbm (Bug #14241) for mod_rewrite
+
+2008-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.3.41, SECURITY_PATCH=3
+ http://httpd.apache.org/security/vulnerabilities_13.html
+
+2007-11-29 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Use upstream apache.gpg
+
+2007-09-10 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.3.39, SECURITY_PATCH=2, updated SOURCE_URLs
+ CVE-2006-5752, CVE-2007-3304
+
+2006-09-29 Arjan Bouter <abouter@sourcemage.org>
+ * CONFLICTS: added apache22
+
+2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
+ * PROVIDES: [automated] Fixed invalid entries.
+
+2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
+ * DETAILS: [automated] Removed BUILD_API=2.
+
+2006-08-13 George Sherwood <george@beernabeer.com>
+ * DETAILS: Updated to 1.3.37
+
+2006-07-04 George Sherwood <george@beernabeer.com>
+ * DETAILS: Upgrade to 1.3.36
+
+2006-05-11 Sergey Lipnevich <sergey@sourcemage.org>
+ * DETAILS: upgrade to 1.3.35.
+
+2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-10-22 Sergey Lipnevich <sergey@sourcemage.org>
+ * DETAILS: upgrade to 1.3.34.
+
+2005-04-17 George Sherwood <george@beernabeer.com>
+ * PROVIDES: added APACHE1 (Bug 6705)
+
+2005-03-09 Sergey Lipnevich <sergey@sourcemage.org>
+ * services: remove, no longer used.
+
+2004-10-31 Ladislav Hagara <hgr@vabo.cz>
+ * BUILD: removed the && from the last line
+
+2004-10-29 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.3.33 (SECURITY FIX)
+ Added BUILD_API=2
+ * BUILD: Converted to BUILD_API 2
+
+2004-06-05 Jason Flatt <jflatt@sourcemage.org>
+ * POST_INSTALL: Removed as it was still trying to start the init
+ script from the old init system.
+
+2004-04-15 Seth Woolley <seth@tautology.org>
+ * DETAILS: updated to 1.3.31 for non-critical security updates
+
+2004-03-11 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * PROVIDES: added provides APACHE, so WEBSERVER can be used more
+ generally for other web servers too
+
+2003-11-02 Eric Sandall <sandalle@sourcemage.org>
+ * PROVIDES: Upper-case provides
+ * HISTORY: Formatted to Guru Handbook
+
+2003-10-28 Sergey Lipnevich <sergey@sourcemage.org>
+ * DETAILS: upgrade to 1.3.29.
+
+2003-08-22 hgg <hgreig@bigpond.net.au>
+ * DETAILS: Update UPDATED purely for test grimoire integration.
+
+2003-07-30 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * init.d/*: updated to new init system
+ * BUILD: no longer creates /var/run/http dir, the init script
+ takes care of this
+
+2003-07-18 Sergey Lipnevich <sergey@sourcemage.org>
+ * DETAILS: Upgrade to 1.3.28.
+
+2003-06-29 Sergey Lipnevich <sergey@sourcemage.org>
+ * CONFIGURE: set correct OPTS.
+ * Added a patch for Berkeley DB 4.1.
+ * POST_INSTALL: will check configuration before restarting.
+ Spell will not stop a running server.
+
+2003-05-01 Rob Verkuylen <rob@verkuylen.net>
+ * init.d/*: Copied /init.d/apache.sh to /init.d/apache.sh
+ Step 1/3 in bug#: 3115
+
+2003-04-08 M.L. <mlubrano@sourcemage.org>
+ * BUILD: Added $OPTS
+
+2003-02-25 Eric Schabell <eschabell@sourcemage.org>
+ * Cleaned up installscript call, not needed.
+
+2003-02-24 Eric Schabell <eschabell@sourcemage.org>
+ * BUILD: Updated and moved apache.sh to init.d script dir
+ for correct usage of init.d as now updated in devel grimoire.
+ runlevel links done automagically, see apache script headder
+ for runlevel settings.
+
+2002-01-08 Sergey Lipnevich <sergey@sourcemage.org>
+ * apache.sh: Improved init script.
+ Copy init script only if none present.
+ * BUILD: Create /var/run/httpd directory.
+
+2002-09-01 Sergey Lipnevich <sergey@sourcemage.org>
+ * BUILD: Updated to have --localstatedir=/var, fixing bug 701.
+
+2002-06-19 Eric Schabell <eric@schabell.com>
+ * DETAILS: Security fix version increase, also changed UPDATE field as this
+ should be applied on your box.
+
+2002-04-08 Eric Schabell <eric@schabell.com>
+ * DETAILS: Reverted back to 1.3.24 due to bugs/complications with php spell and
+ other user problems.
+
+2002-04-07 Eric Schabell <eric@schabell.com>
+ * DETAILS: Updated version to 2.0.35:
+ * This is the initial, stable release of the Apache 2.0 series. Compared
+ to the 1.3 series, Apache 2.0 offers higher performance, better
+ scalability, integrated SSL and WebDAV support, improved HTTP proxy
+ support, and I/O layering and filtering.
+
+2002-03-28 Eric Schabell <eric@schabell.com>
+ * DETAILS: Added MAINTAINER line.
+
+2002-03-25 Eric Schabell <eric@schabell.com>
+ * DETAILS: Updated version to 1.3.24:
+ The Apache Group is pleased to announce the release
+ of the 1.3.24 version of the Apache HTTP server.
+ Apache 1.3.24 is principally a security and bug fix
+ release. Of particular note is that 1.3.24 addresses
+ and fixes the issues noted in CAN-2002-0061 (mitre.org)
+ regarding escaping of command line args on Win32.
+ Apache 1.3.24 is the best version of Apache currently
+ available.
+
+2002-03-13 Eric Schabell <eric@schabell.com>
+ * HISTORY: Added
+
diff --git a/http/apache1/PRE_BUILD b/http/apache1/PRE_BUILD
new file mode 100755
index 0000000000..42fa815351
--- /dev/null
+++ b/http/apache1/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/apache_1.3.41_glic.patch
diff --git a/http/apache/PROVIDES b/http/apache1/PROVIDES
index 6dd2c89ad3..6dd2c89ad3 100755
--- a/http/apache/PROVIDES
+++ b/http/apache1/PROVIDES
diff --git a/http/apache/apache_1.3.41_glic.patch b/http/apache1/apache_1.3.41_glic.patch
index 70b8829d15..70b8829d15 100644
--- a/http/apache/apache_1.3.41_glic.patch
+++ b/http/apache1/apache_1.3.41_glic.patch
diff --git a/http/apache/init.d/apache b/http/apache1/init.d/apache
index a6e87a1763..a6e87a1763 100755
--- a/http/apache/init.d/apache
+++ b/http/apache1/init.d/apache