Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.43 grimoire by George Sherwood (01d5e388379fef71604b2d3a6a6d21fd29ce4751)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.43 grimoire by George Sherwood (01d5e388379fef71604b2d3a6a6d21fd29ce4751)
  • Date: Mon, 3 May 2010 20:04:18 -0500

GIT changes to stable-0.43 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

ChangeLog | 3
http/apache/BUILD | 14 ---
http/apache/CONFLICTS | 8 -
http/apache/DEPENDS | 7 -
http/apache/DETAILS | 29 +-----
http/apache/DOWNLOAD | 1
http/apache/HISTORY | 6 +
http/apache/INSTALL | 1
http/apache/PRE_BUILD | 4
http/apache/PROVIDES | 3
http/apache/TRIGGERS | 1
http/apache/apache_1.3.41_glic.patch | 105 -----------------------
http/apache/init.d/apache | 54 ------------
http/apache1/BUILD | 13 ++
http/apache1/CONFLICTS | 9 ++
http/apache1/DEPENDS | 6 +
http/apache1/DETAILS | 22 ++++
http/apache1/HISTORY | 153
++++++++++++++++++++++++++++++++++
http/apache1/PRE_BUILD | 3
http/apache1/PROVIDES | 3
http/apache1/apache_1.3.41_glic.patch | 105 +++++++++++++++++++++++
http/apache1/init.d/apache | 54 ++++++++++++
22 files changed, 390 insertions(+), 214 deletions(-)

New commits:
commit 01d5e388379fef71604b2d3a6a6d21fd29ce4751
Author: Mark Bainter <mbainter AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

http/apache: apache deprecated and renamed to apache1 for Bug #13532

diff --git a/ChangeLog b/ChangeLog
index 0ce740e..cc41544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-10 Mark Bainter <mbainter AT sourcemage.org>
+ * http/apache: spell deprecated [renamed to apache1] for Bug #13532
+
2010-04-01 Arjan Bouter <abouter AT sourcemage.org>
* spelling/mythes: new spell, thesaurus library

diff --git a/http/apache/BUILD b/http/apache/BUILD
index 210aa41..27ba77d 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/CONFLICTS b/http/apache/CONFLICTS
deleted file mode 100755
index 9507f3f..0000000
--- a/http/apache/CONFLICTS
+++ /dev/null
@@ -1,8 +0,0 @@
-conflicts apache-mod_ssl &&
-conflicts apache2 &&
-conflicts apache22 &&
-persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
-if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
- message "apache and xshttpd both provide the httpd binary, recast xshttpd
with the binary prefix if you wish to keep both spells installed." 1>&2
- conflicts xshttpd
-fi
diff --git a/http/apache/DEPENDS b/http/apache/DEPENDS
index 6e63efc..4410a52 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 76206df..e8221ef 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 0000000..27ba77d
--- /dev/null
+++ b/http/apache/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/http/apache/HISTORY b/http/apache/HISTORY
index 9e713ef..3c18bfb 100644
--- a/http/apache/HISTORY
+++ b/http/apache/HISTORY
@@ -1,3 +1,9 @@
+2010-03-23 Mark Bainter <mbainter AT 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 AT 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 0000000..27ba77d
--- /dev/null
+++ b/http/apache/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/http/apache/PRE_BUILD b/http/apache/PRE_BUILD
index 42fa815..27ba77d 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/PROVIDES b/http/apache/PROVIDES
deleted file mode 100755
index 6dd2c89..0000000
--- a/http/apache/PROVIDES
+++ /dev/null
@@ -1,3 +0,0 @@
-WEBSERVER
-APACHE
-APACHE1
diff --git a/http/apache/TRIGGERS b/http/apache/TRIGGERS
new file mode 100755
index 0000000..a2943e5
--- /dev/null
+++ b/http/apache/TRIGGERS
@@ -0,0 +1 @@
+on_cast apache dispel_self
diff --git a/http/apache/apache_1.3.41_glic.patch
b/http/apache/apache_1.3.41_glic.patch
deleted file mode 100644
index 70b8829..0000000
--- a/http/apache/apache_1.3.41_glic.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Naur apache_1.3.41.orig/src/CHANGES apache_1.3.41/src/CHANGES
---- apache_1.3.41.orig/src/CHANGES 2009-09-04 03:25:47.985940104 +0200
-+++ apache_1.3.41/src/CHANGES 2009-09-04 03:38:00.517933711 +0200
-@@ -3838,7 +3838,7 @@
- response when we already know the final status, which is mighty
- useful for PUT responses that result in 302 or 401. [Roy Fielding]
-
-- *) Remove extra trailing whitespace from the getline results as part
-+ *) Remove extra trailing whitespace from the apache_getline results as
part
- of the protocol processing, which is extra nice because it works
- between continuation lines, is almost no cost in the normal case
- of no extra whitespace, and saves memory. [Roy Fielding]
-diff -Naur apache_1.3.41.orig/src/makefile.win apache_1.3.41/src/makefile.win
---- apache_1.3.41.orig/src/makefile.win 2009-09-04 03:25:47.977940271
+0200
-+++ apache_1.3.41/src/makefile.win 2009-09-04 03:38:00.629935291 +0200
-@@ -238,7 +238,7 @@
- dstfl = ARGV[2];
- serverroot = ARGV[3];
- gsub( /\\/, "/", serverroot );
-- while ( ( getline < srcfl ) > 0 ) {
-+ while ( ( apache_getline < srcfl ) > 0 ) {
- gsub( /@@ServerRoot@@/, serverroot );
- print $$0 > dstfl;
- }
-diff -Naur apache_1.3.41.orig/src/support/htdigest.c
apache_1.3.41/src/support/htdigest.c
---- apache_1.3.41.orig/src/support/htdigest.c 2009-09-04 03:25:47.961939627
+0200
-+++ apache_1.3.41/src/support/htdigest.c 2009-09-04 03:38:00.869950312
+0200
-@@ -71,7 +71,7 @@
- while ((line[y++] = line[x++]));
- }
-
--static int getline(char *s, int n, FILE *f)
-+static int apache_getline(char *s, int n, FILE *f)
- {
- register int i = 0;
-
-@@ -158,7 +158,7 @@
- {
- static char line[MAX_STRING_LEN];
-
-- while (!(getline(line, MAX_STRING_LEN, source))) {
-+ while (!(apache_getline(line, MAX_STRING_LEN, source))) {
- putline(target, line);
- }
- }
-@@ -216,7 +216,7 @@
- ap_cpystrn(realm, argv[2], sizeof(realm));
-
- found = 0;
-- while (!(getline(line, MAX_STRING_LEN, f))) {
-+ while (!(apache_getline(line, MAX_STRING_LEN, f))) {
- if (found || (line[0] == '#') || (!line[0])) {
- putline(tfp, line);
- continue;
-diff -Naur apache_1.3.41.orig/src/support/htpasswd.c
apache_1.3.41/src/support/htpasswd.c
---- apache_1.3.41.orig/src/support/htpasswd.c 2009-09-04 03:25:47.961939627
+0200
-+++ apache_1.3.41/src/support/htpasswd.c 2009-09-04 03:38:00.933935289
+0200
-@@ -98,7 +98,7 @@
- * Get a line of input from the user, not including any terminating
- * newline.
- */
--static int getline(char *s, int n, FILE *f)
-+static int apache_getline(char *s, int n, FILE *f)
- {
- register int i = 0;
-
-@@ -547,7 +547,7 @@
- char scratch[MAX_STRING_LEN];
-
- fpw = fopen(pwfilename, "r");
-- while (! (getline(line, sizeof(line), fpw))) {
-+ while (! (apache_getline(line, sizeof(line), fpw))) {
- char *colon;
-
- if ((line[0] == '#') || (line[0] == '\0')) {
-diff -Naur apache_1.3.41.orig/src/support/logresolve.c
apache_1.3.41/src/support/logresolve.c
---- apache_1.3.41.orig/src/support/logresolve.c 2009-09-04
03:25:47.961939627 +0200
-+++ apache_1.3.41/src/support/logresolve.c 2009-09-04 03:38:01.037948767
+0200
-@@ -71,7 +71,7 @@
- #endif /* !MPE && !WIN32*/
-
- static void cgethost(struct in_addr ipnum, char *string, int check);
--static int getline(char *s, int n);
-+static int apache_getline(char *s, int n);
- static void stats(FILE *output);
-
-
-@@ -278,7 +278,7 @@
- * gets a line from stdin
- */
-
--static int getline (char *s, int n)
-+static int apache_getline (char *s, int n)
- {
- char *cp;
-
-@@ -326,7 +326,7 @@
- for (i = 0; i < MAX_ERR + 2; i++)
- errors[i] = 0;
-
-- while (getline(line, MAXLINE)) {
-+ while (apache_getline(line, MAXLINE)) {
- if (line[0] == '\0')
- continue;
- entries++;
diff --git a/http/apache/init.d/apache b/http/apache/init.d/apache
deleted file mode 100755
index a6e87a1..0000000
--- a/http/apache/init.d/apache
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-PROGRAM=/bin/false
-RUNLEVEL=3
-NEEDS="+network +remote_fs"
-PIDFILE=/var/run/httpd/httpd.pid
-
-. /etc/init.d/smgl_init
-
-start()
-{
- [ ! -d /var/run/httpd ] && mkdir /var/run/httpd
- echo "Starting Apache web server..."
- /usr/sbin/apachectl start
- evaluate_retval
-}
-
-restart()
-{
- echo "Restarting Apache web server..."
- if [ -f $PIDFILE ]; then
- /usr/sbin/apachectl restart
- evaluate_retval
- else
- run_func start
- fi
-}
-
-stop()
-{
- echo "Stopping Apache web server..."
- /usr/sbin/apachectl stop
- evaluate_retval
-}
-
-status()
-{
- getpids httpd
- if [ -n "$pidlist" ]; then
- echo "Apache is running with Process ID(s) $pidlist"
- else
- if [ -f $PIDFILE ]; then
- echo "Apache is not running but $PIDFILE exists"
- return 1
- else
- echo "Apache is not running"
- fi
- fi
-}
-
-reload()
-{
- run_func restart
-}
diff --git a/http/apache1/BUILD b/http/apache1/BUILD
new file mode 100755
index 0000000..210aa41
--- /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/apache1/CONFLICTS b/http/apache1/CONFLICTS
new file mode 100755
index 0000000..6f5fbf0
--- /dev/null
+++ b/http/apache1/CONFLICTS
@@ -0,0 +1,9 @@
+conflicts apache &&
+conflicts apache-mod_ssl &&
+conflicts apache2 &&
+conflicts apache22 &&
+persistent_read xshttpd XSHTTPD_USE_PREFIX XSHTTPD_USE_PREFIX &&
+if [[ "$XSHTTPD_USE_PREFIX" != "y" ]]; then
+ message "apache and xshttpd both provide the httpd binary, recast xshttpd
with the binary prefix if you wish to keep both spells installed." 1>&2
+ conflicts xshttpd
+fi
diff --git a/http/apache1/DEPENDS b/http/apache1/DEPENDS
new file mode 100755
index 0000000..6e63efc
--- /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 0000000..76206df
--- /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 0000000..c2c54c1
--- /dev/null
+++ b/http/apache1/HISTORY
@@ -0,0 +1,153 @@
+2010-03-23 Mark Bainter <mbainter AT sourcemage.org>
+ * Renamed from apache to apache1
+ * CONFLICTS: added apache (deprecated)
+
+2009-09-04 Quentin Rameau <quinq AT sourcemage.org>
+ * PRE_BUILD, apache_1.3.41_glic.patch: added, glibc 2.10 compatibility
+
+2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: conflict with xshttpd if that is compiled without prefix
+
+2008-01-25 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depend on gdbm (Bug #14241) for mod_rewrite
+
+2008-01-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.41, SECURITY_PATCH=3
+ http://httpd.apache.org/security/vulnerabilities_13.html
+
+2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Use upstream apache.gpg
+
+2007-09-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.39, SECURITY_PATCH=2, updated SOURCE_URLs
+ CVE-2006-5752, CVE-2007-3304
+
+2006-09-29 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFLICTS: added apache22
+
+2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PROVIDES: [automated] Fixed invalid entries.
+
+2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed BUILD_API=2.
+
+2006-08-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 1.3.37
+
+2006-07-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Upgrade to 1.3.36
+
+2006-05-11 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 1.3.35.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-10-22 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 1.3.34.
+
+2005-04-17 George Sherwood <george AT beernabeer.com>
+ * PROVIDES: added APACHE1 (Bug 6705)
+
+2005-03-09 Sergey Lipnevich <sergey AT sourcemage.org>
+ * services: remove, no longer used.
+
+2004-10-31 Ladislav Hagara <hgr AT vabo.cz>
+ * BUILD: removed the && from the last line
+
+2004-10-29 Eric Sandall <sandalle AT 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 AT 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 AT tautology.org>
+ * DETAILS: updated to 1.3.31 for non-critical security updates
+
+2004-03-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PROVIDES: added provides APACHE, so WEBSERVER can be used more
+ generally for other web servers too
+
+2003-11-02 Eric Sandall <sandalle AT sourcemage.org>
+ * PROVIDES: Upper-case provides
+ * HISTORY: Formatted to Guru Handbook
+
+2003-10-28 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 1.3.29.
+
+2003-08-22 hgg <hgreig AT bigpond.net.au>
+ * DETAILS: Update UPDATED purely for test grimoire integration.
+
+2003-07-30 Arwed v. Merkatz <v.merkatz AT 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 AT sourcemage.org>
+ * DETAILS: Upgrade to 1.3.28.
+
+2003-06-29 Sergey Lipnevich <sergey AT 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 AT 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 AT sourcemage.org>
+ * BUILD: Added $OPTS
+
+2003-02-25 Eric Schabell <eschabell AT sourcemage.org>
+ * Cleaned up installscript call, not needed.
+
+2003-02-24 Eric Schabell <eschabell AT 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 AT 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 AT sourcemage.org>
+ * BUILD: Updated to have --localstatedir=/var, fixing bug 701.
+
+2002-06-19 Eric Schabell <eric AT 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 AT 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 AT 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 AT schabell.com>
+ * DETAILS: Added MAINTAINER line.
+
+2002-03-25 Eric Schabell <eric AT 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 AT schabell.com>
+ * HISTORY: Added
+
diff --git a/http/apache1/PRE_BUILD b/http/apache1/PRE_BUILD
new file mode 100755
index 0000000..42fa815
--- /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/apache1/PROVIDES b/http/apache1/PROVIDES
new file mode 100755
index 0000000..6dd2c89
--- /dev/null
+++ b/http/apache1/PROVIDES
@@ -0,0 +1,3 @@
+WEBSERVER
+APACHE
+APACHE1
diff --git a/http/apache1/apache_1.3.41_glic.patch
b/http/apache1/apache_1.3.41_glic.patch
new file mode 100644
index 0000000..70b8829
--- /dev/null
+++ b/http/apache1/apache_1.3.41_glic.patch
@@ -0,0 +1,105 @@
+diff -Naur apache_1.3.41.orig/src/CHANGES apache_1.3.41/src/CHANGES
+--- apache_1.3.41.orig/src/CHANGES 2009-09-04 03:25:47.985940104 +0200
++++ apache_1.3.41/src/CHANGES 2009-09-04 03:38:00.517933711 +0200
+@@ -3838,7 +3838,7 @@
+ response when we already know the final status, which is mighty
+ useful for PUT responses that result in 302 or 401. [Roy Fielding]
+
+- *) Remove extra trailing whitespace from the getline results as part
++ *) Remove extra trailing whitespace from the apache_getline results as
part
+ of the protocol processing, which is extra nice because it works
+ between continuation lines, is almost no cost in the normal case
+ of no extra whitespace, and saves memory. [Roy Fielding]
+diff -Naur apache_1.3.41.orig/src/makefile.win apache_1.3.41/src/makefile.win
+--- apache_1.3.41.orig/src/makefile.win 2009-09-04 03:25:47.977940271
+0200
++++ apache_1.3.41/src/makefile.win 2009-09-04 03:38:00.629935291 +0200
+@@ -238,7 +238,7 @@
+ dstfl = ARGV[2];
+ serverroot = ARGV[3];
+ gsub( /\\/, "/", serverroot );
+- while ( ( getline < srcfl ) > 0 ) {
++ while ( ( apache_getline < srcfl ) > 0 ) {
+ gsub( /@@ServerRoot@@/, serverroot );
+ print $$0 > dstfl;
+ }
+diff -Naur apache_1.3.41.orig/src/support/htdigest.c
apache_1.3.41/src/support/htdigest.c
+--- apache_1.3.41.orig/src/support/htdigest.c 2009-09-04 03:25:47.961939627
+0200
++++ apache_1.3.41/src/support/htdigest.c 2009-09-04 03:38:00.869950312
+0200
+@@ -71,7 +71,7 @@
+ while ((line[y++] = line[x++]));
+ }
+
+-static int getline(char *s, int n, FILE *f)
++static int apache_getline(char *s, int n, FILE *f)
+ {
+ register int i = 0;
+
+@@ -158,7 +158,7 @@
+ {
+ static char line[MAX_STRING_LEN];
+
+- while (!(getline(line, MAX_STRING_LEN, source))) {
++ while (!(apache_getline(line, MAX_STRING_LEN, source))) {
+ putline(target, line);
+ }
+ }
+@@ -216,7 +216,7 @@
+ ap_cpystrn(realm, argv[2], sizeof(realm));
+
+ found = 0;
+- while (!(getline(line, MAX_STRING_LEN, f))) {
++ while (!(apache_getline(line, MAX_STRING_LEN, f))) {
+ if (found || (line[0] == '#') || (!line[0])) {
+ putline(tfp, line);
+ continue;
+diff -Naur apache_1.3.41.orig/src/support/htpasswd.c
apache_1.3.41/src/support/htpasswd.c
+--- apache_1.3.41.orig/src/support/htpasswd.c 2009-09-04 03:25:47.961939627
+0200
++++ apache_1.3.41/src/support/htpasswd.c 2009-09-04 03:38:00.933935289
+0200
+@@ -98,7 +98,7 @@
+ * Get a line of input from the user, not including any terminating
+ * newline.
+ */
+-static int getline(char *s, int n, FILE *f)
++static int apache_getline(char *s, int n, FILE *f)
+ {
+ register int i = 0;
+
+@@ -547,7 +547,7 @@
+ char scratch[MAX_STRING_LEN];
+
+ fpw = fopen(pwfilename, "r");
+- while (! (getline(line, sizeof(line), fpw))) {
++ while (! (apache_getline(line, sizeof(line), fpw))) {
+ char *colon;
+
+ if ((line[0] == '#') || (line[0] == '\0')) {
+diff -Naur apache_1.3.41.orig/src/support/logresolve.c
apache_1.3.41/src/support/logresolve.c
+--- apache_1.3.41.orig/src/support/logresolve.c 2009-09-04
03:25:47.961939627 +0200
++++ apache_1.3.41/src/support/logresolve.c 2009-09-04 03:38:01.037948767
+0200
+@@ -71,7 +71,7 @@
+ #endif /* !MPE && !WIN32*/
+
+ static void cgethost(struct in_addr ipnum, char *string, int check);
+-static int getline(char *s, int n);
++static int apache_getline(char *s, int n);
+ static void stats(FILE *output);
+
+
+@@ -278,7 +278,7 @@
+ * gets a line from stdin
+ */
+
+-static int getline (char *s, int n)
++static int apache_getline (char *s, int n)
+ {
+ char *cp;
+
+@@ -326,7 +326,7 @@
+ for (i = 0; i < MAX_ERR + 2; i++)
+ errors[i] = 0;
+
+- while (getline(line, MAXLINE)) {
++ while (apache_getline(line, MAXLINE)) {
+ if (line[0] == '\0')
+ continue;
+ entries++;
diff --git a/http/apache1/init.d/apache b/http/apache1/init.d/apache
new file mode 100755
index 0000000..a6e87a1
--- /dev/null
+++ b/http/apache1/init.d/apache
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+PIDFILE=/var/run/httpd/httpd.pid
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ [ ! -d /var/run/httpd ] && mkdir /var/run/httpd
+ echo "Starting Apache web server..."
+ /usr/sbin/apachectl start
+ evaluate_retval
+}
+
+restart()
+{
+ echo "Restarting Apache web server..."
+ if [ -f $PIDFILE ]; then
+ /usr/sbin/apachectl restart
+ evaluate_retval
+ else
+ run_func start
+ fi
+}
+
+stop()
+{
+ echo "Stopping Apache web server..."
+ /usr/sbin/apachectl stop
+ evaluate_retval
+}
+
+status()
+{
+ getpids httpd
+ if [ -n "$pidlist" ]; then
+ echo "Apache is running with Process ID(s) $pidlist"
+ else
+ if [ -f $PIDFILE ]; then
+ echo "Apache is not running but $PIDFILE exists"
+ return 1
+ else
+ echo "Apache is not running"
+ fi
+ fi
+}
+
+reload()
+{
+ run_func restart
+}



  • [SM-Commit] GIT changes to stable-0.43 grimoire by George Sherwood (01d5e388379fef71604b2d3a6a6d21fd29ce4751), George Sherwood, 05/03/2010

Archive powered by MHonArc 2.6.24.

Top of Page