Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (d05aa87d1b432dcde20f05a04c35f86ca84de8c5)
  • Date: Mon, 5 Feb 2007 22:59:43 -0600

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

http/apache2/DETAILS | 2 +-
http/apache2/HISTORY | 5 +++--
http/apache2/config.layout | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)

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

Fix Bug #13295 (apache2 sysconfdir is /usr/etc/apache2)

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

Revert "Fix Bug #13295 (apache2 sysconfdir is /usr/etc/apache2)"

This reverts commit 38f8b7dc164e00172ccc0de06177af05a8bc94cd.

We (SMGL) want to use 'httpd' rather than 'apache2' for directory names.
So sayeth the wise emrys. :)

diff --git a/http/apache2/DETAILS b/http/apache2/DETAILS
index 62d9cd8..63175aa 100755
--- a/http/apache2/DETAILS
+++ b/http/apache2/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-
SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
SECURITY_PATCH=1
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=APACHE
KEYWORDS="http"
WEB_SITE=http://www.apache.org/
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index e5d61f8..1e252bd 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,8 +1,9 @@
2007-02-05 Eric Sandall <eric AT sandall.us>
- * DETAILS: Incremented PATCHLEVEL
+ * DETAILS: Incremented PATCHLEVEL to 2
Removed UPDATED
* config.layout: Fix Bug #13295
- sysconfdir should be /etc/apache2 to follow 'standards'
+ sysconfdir should be /etc/httpd
+ datadir should be /usr/share/apache2

2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163
diff --git a/http/apache2/config.layout b/http/apache2/config.layout
index 0459d5d..e65f5ab 100644
--- a/http/apache2/config.layout
+++ b/http/apache2/config.layout
@@ -18,8 +18,8 @@
libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/libexec
mandir: ${prefix}/share/man
- sysconfdir: ${INSTALL_ROOT}/etc+
- datadir: ${INSTALL_ROOT}/var/www+
+ sysconfdir: ${INSTALL_ROOT}/etc/httpd
+ datadir: ${INSTALL_ROOT}/usr/share+
installbuilddir: ${datadir}/build
errordir: ${datadir}/error
iconsdir: ${datadir}/icons




Archive powered by MHonArc 2.6.24.

Top of Page