Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.6 grimoire by Jeremy Blosser (e9ec18c9f735a9bd2bc4a65f22bd8ca9f56130bd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.6 grimoire by Jeremy Blosser (e9ec18c9f735a9bd2bc4a65f22bd8ca9f56130bd)
  • Date: Tue, 6 Feb 2007 02:06:46 -0600

GIT changes to stable-0.6 grimoire by Jeremy Blosser
<jblosser-smgl AT firinn.org>:

http/apache2/DETAILS | 8 ++++----
http/apache2/HISTORY | 11 +++++++++++
http/apache2/config.layout | 6 +++---
3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit e9ec18c9f735a9bd2bc4a65f22bd8ca9f56130bd
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

apache2: a couple more minor tweaks for #13295
(cherry picked from commit e9349f63f78a2e179fb7904089fa4294a4758f28)

commit caabea66e8a7516b1a46a6458d5be0c073ab8a4d
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

apache2: a couple more minor tweaks for #13295
(cherry picked from commit 0b4c6d69da478bc6b337f876f332e3a6d49b8b83)

commit 266882273a7cb1139913caa249b498dfc8822d51
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

Fix Bug #13295 (apache2 sysconfdir is /usr/etc/apache2)
(cherry picked from commit d05aa87d1b432dcde20f05a04c35f86ca84de8c5)

diff --git a/http/apache2/DETAILS b/http/apache2/DETAILS
index 7d749c0..823b19c 100755
--- a/http/apache2/DETAILS
+++ b/http/apache2/DETAILS
@@ -1,16 +1,16 @@
SPELL=apache2
VERSION=2.0.59
- SECURITY_PATCH=1
SOURCE=httpd-$VERSION.tar.gz
SOURCE_GPG="httpd.gpg:${SOURCE}.asc:UPSTREAM_KEY"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
- WEB_SITE=http://www.apache.org/
- ENTERED=20020422
- UPDATED=20050923
+ SECURITY_PATCH=1
+ PATCHLEVEL=3
LICENSE[0]=APACHE
KEYWORDS="http"
+ WEB_SITE=http://www.apache.org/
+ ENTERED=20020422
SHORT="Apache 2 HTTP server"
cat << EOF
The Apache Group is proud to announce the release the first GA release of
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 26b7514..f0ce8b9 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,14 @@
+2007-02-06 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * DETAILS: PATCHLEVEL++
+ * config.layout: Some more tweaks for bugs 13295 and 13051.
+
+2007-02-05 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Incremented PATCHLEVEL to 2
+ Removed UPDATED
+ * config.layout: Fix Bug #13295
+ sysconfdir should be /etc/httpd
+ datadir should be /usr/share/apache2
+
2006-10-21 George Sherwood <george AT beernabeer.com>
* BUILD: cp config.layout file. Use SMGL layout. Bug #13051.
* config.layout: added file for SMGL layout
diff --git a/http/apache2/config.layout b/http/apache2/config.layout
index 5621559..c8905a3 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: ${prefix}/etc+
- datadir: ${INSTALL_ROOT}/var/www+
+ sysconfdir: ${INSTALL_ROOT}/etc/httpd
+ datadir: ${prefix}/share+
installbuilddir: ${datadir}/build
errordir: ${datadir}/error
iconsdir: ${datadir}/icons
@@ -30,6 +30,6 @@
localstatedir: ${INSTALL_ROOT}/var
runtimedir: ${localstatedir}/run
logfiledir: ${localstatedir}/log+
- proxycachedir: ${localstatedir}/proxy
+ proxycachedir: ${localstatedir}/cache/apache2/proxy
</Layout>




  • [SM-Commit] GIT changes to stable-0.6 grimoire by Jeremy Blosser (e9ec18c9f735a9bd2bc4a65f22bd8ca9f56130bd), Jeremy Blosser, 02/06/2007

Archive powered by MHonArc 2.6.24.

Top of Page