Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (5f4ec3982a6d350a6fe4353cf283b333ce92598c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5f4ec3982a6d350a6fe4353cf283b333ce92598c)
  • Date: Sun, 10 Aug 2008 03:11:00 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

http/apache22/DEPENDS | 8 +++++++-
http/apache22/HISTORY | 6 ++++++
http/apache22/init.d/apache | 4 +---
http/apache22/init.d/apache.conf | 4 ----
4 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 5f4ec3982a6d350a6fe4353cf283b333ce92598c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

apache22: According to http://httpd.apache.org/docs/2.2/upgrading.html,
startssl is no longer available and should now be configured with mod_ssl
Removed init.d/apache.conf as it is only used for start or startssl

commit f8bc778fe95531e945ac3982d6676fc74e48c86f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

apache22: Optionally depends on pcre for system pcre

diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index 3273c14..af158fc 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -2,7 +2,13 @@
#depends apr-util "--with-apr-util=${INSTALL_ROOT}/usr" &&
depends apr &&
depends apr-util &&
+
optional_depends openssl \
'--enable-ssl' \
'--disable-ssl' \
- 'for SSL/TLS support'
+ 'for SSL/TLS support' &&
+
+optional_depends 'pcre' \
+ '--with-pcre' \
+ '' \
+ 'for system Perl Compatible Regular Expression Library'
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 0fa393d..a14a943 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,9 @@
+2008-08-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on pcre for system-installed version
+ * init.d/apache: According to
http://httpd.apache.org/docs/2.2/upgrading.html,
+ startssl is no longer available and should now be configured with
mod_ssl
+ * init.d/apache.conf: Removed, only used for start or startssl
+
2008-06-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.9, SECURITY_PATCH=4, CVE-2008-2364, CVE-2007-6420

diff --git a/http/apache22/init.d/apache b/http/apache22/init.d/apache
index d8639f3..3cabf23 100755
--- a/http/apache22/init.d/apache
+++ b/http/apache22/init.d/apache
@@ -1,7 +1,5 @@
#!/bin/bash

-. /etc/sysconfig/apache
-
PROGRAM=/bin/false
RUNLEVEL=3
NEEDS="+network +remote_fs"
@@ -12,7 +10,7 @@ PIDFILE=/var/run/httpd.pid
start()
{
echo "Starting Apache web server..."
- /usr/sbin/apachectl $STARTCOMMAND
+ /usr/sbin/apachectl start
evaluate_retval
}

diff --git a/http/apache22/init.d/apache.conf
b/http/apache22/init.d/apache.conf
deleted file mode 100644
index 4cf1fc1..0000000
--- a/http/apache22/init.d/apache.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# should the server start in ssl or normal mode
-# "start" = normal mode
-# "startssl" = ssl mode
-STARTCOMMAND="start"



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (5f4ec3982a6d350a6fe4353cf283b333ce92598c), Eric Sandall, 08/10/2008

Archive powered by MHonArc 2.6.24.

Top of Page