diff options
| author | Eric Sandall | 2007-02-05 20:58:30 -0800 |
|---|---|---|
| committer | Jeremy Blosser | 2007-02-06 01:50:33 -0600 |
| commit | 266882273a7cb1139913caa249b498dfc8822d51 (patch) | |
| tree | 22f43803222074c67b8fe26e016a724ad0538621 | |
| parent | aa4ed98bcbc8edc8dff0e0e75a4d183b88c108ab (diff) | |
Fix Bug #13295 (apache2 sysconfdir is /usr/etc/apache2)
(cherry picked from commit d05aa87d1b432dcde20f05a04c35f86ca84de8c5)
| -rwxr-xr-x | http/apache2/DETAILS | 8 | ||||
| -rw-r--r-- | http/apache2/HISTORY | 7 | ||||
| -rw-r--r-- | http/apache2/config.layout | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/http/apache2/DETAILS b/http/apache2/DETAILS index 7d749c0434..63175aae0f 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=2 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 26b7514445..6cbd4f15dd 100644 --- a/http/apache2/HISTORY +++ b/http/apache2/HISTORY @@ -1,3 +1,10 @@ +2007-02-05 Eric Sandall <eric@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@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 56215594f3..e65f5ab51d 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: ${INSTALL_ROOT}/usr/share+ installbuilddir: ${datadir}/build errordir: ${datadir}/error iconsdir: ${datadir}/icons |