ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

apache: update to 2.2.3

Browse Source
This commit is contained in:
Juergen Daubert 2006-11-25 16:14:10 +01:00
parent bf54c5cca0
commit 980b3196f2
6 changed files with 71 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
apache/.footprint
View File

@ -1,13 +1,34 @@
drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/
drwxr-xr-x root/root etc/apache/ drwxr-xr-x root/root etc/apache/
-rw-r--r-- root/root etc/apache/highperformance-std.conf drwxr-xr-x root/root etc/apache/extra/
-rw-r--r-- root/root etc/apache/highperformance.conf -rw-r--r-- root/root etc/apache/extra/httpd-autoindex.conf
-rw-r--r-- root/root etc/apache/httpd-std.conf -rw-r--r-- root/root etc/apache/extra/httpd-dav.conf
-rw-r--r-- root/root etc/apache/extra/httpd-default.conf
-rw-r--r-- root/root etc/apache/extra/httpd-info.conf
-rw-r--r-- root/root etc/apache/extra/httpd-languages.conf
-rw-r--r-- root/root etc/apache/extra/httpd-manual.conf
-rw-r--r-- root/root etc/apache/extra/httpd-mpm.conf
-rw-r--r-- root/root etc/apache/extra/httpd-multilang-errordoc.conf
-rw-r--r-- root/root etc/apache/extra/httpd-ssl.conf
-rw-r--r-- root/root etc/apache/extra/httpd-userdir.conf
-rw-r--r-- root/root etc/apache/extra/httpd-vhosts.conf
-rw-r--r-- root/root etc/apache/httpd.conf -rw-r--r-- root/root etc/apache/httpd.conf
-rw-r--r-- root/root etc/apache/magic -rw-r--r-- root/root etc/apache/magic
-rw-r--r-- root/root etc/apache/mime.types -rw-r--r-- root/root etc/apache/mime.types
-rw-r--r-- root/root etc/apache/ssl-std.conf drwxr-xr-x root/root etc/apache/original/
-rw-r--r-- root/root etc/apache/ssl.conf drwxr-xr-x root/root etc/apache/original/extra/
-rw-r--r-- root/root etc/apache/original/extra/httpd-autoindex.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-dav.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-default.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-info.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-languages.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-manual.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-mpm.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-multilang-errordoc.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-ssl.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-userdir.conf
-rw-r--r-- root/root etc/apache/original/extra/httpd-vhosts.conf
-rw-r--r-- root/root etc/apache/original/httpd.conf
drwxr-xr-x root/root etc/rc.d/ drwxr-xr-x root/root etc/rc.d/
-rwxr-xr-x root/root etc/rc.d/apache -rwxr-xr-x root/root etc/rc.d/apache
drwxr-xr-x root/root etc/ssl/ drwxr-xr-x root/root etc/ssl/
@ -16,7 +37,6 @@ drwxr-xr-x root/root etc/ssl/certs/
drwxr-xr-x root/root etc/ssl/keys/ drwxr-xr-x root/root etc/ssl/keys/
-rw-r--r-- root/root etc/ssl/keys/apache.key (EMPTY) -rw-r--r-- root/root etc/ssl/keys/apache.key (EMPTY)
drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/apache/ drwxr-xr-x root/root usr/include/apache/
-rw-r--r-- root/root usr/include/apache/ap_compat.h -rw-r--r-- root/root usr/include/apache/ap_compat.h
@ -27,6 +47,7 @@ drwxr-xr-x root/root usr/include/apache/
-rw-r--r-- root/root usr/include/apache/ap_mmn.h -rw-r--r-- root/root usr/include/apache/ap_mmn.h
-rw-r--r-- root/root usr/include/apache/ap_mpm.h -rw-r--r-- root/root usr/include/apache/ap_mpm.h
-rw-r--r-- root/root usr/include/apache/ap_provider.h -rw-r--r-- root/root usr/include/apache/ap_provider.h
-rw-r--r-- root/root usr/include/apache/ap_regex.h
-rw-r--r-- root/root usr/include/apache/ap_regkey.h -rw-r--r-- root/root usr/include/apache/ap_regkey.h
-rw-r--r-- root/root usr/include/apache/ap_release.h -rw-r--r-- root/root usr/include/apache/ap_release.h
-rw-r--r-- root/root usr/include/apache/http_config.h -rw-r--r-- root/root usr/include/apache/http_config.h
@ -38,9 +59,11 @@ drwxr-xr-x root/root usr/include/apache/
-rw-r--r-- root/root usr/include/apache/http_request.h -rw-r--r-- root/root usr/include/apache/http_request.h
-rw-r--r-- root/root usr/include/apache/http_vhost.h -rw-r--r-- root/root usr/include/apache/http_vhost.h
-rw-r--r-- root/root usr/include/apache/httpd.h -rw-r--r-- root/root usr/include/apache/httpd.h
-rw-r--r-- root/root usr/include/apache/mod_auth.h
-rw-r--r-- root/root usr/include/apache/mod_cgi.h -rw-r--r-- root/root usr/include/apache/mod_cgi.h
-rw-r--r-- root/root usr/include/apache/mod_core.h -rw-r--r-- root/root usr/include/apache/mod_core.h
-rw-r--r-- root/root usr/include/apache/mod_dav.h -rw-r--r-- root/root usr/include/apache/mod_dav.h
-rw-r--r-- root/root usr/include/apache/mod_dbd.h
-rw-r--r-- root/root usr/include/apache/mod_include.h -rw-r--r-- root/root usr/include/apache/mod_include.h
-rw-r--r-- root/root usr/include/apache/mod_log_config.h -rw-r--r-- root/root usr/include/apache/mod_log_config.h
-rw-r--r-- root/root usr/include/apache/mod_proxy.h -rw-r--r-- root/root usr/include/apache/mod_proxy.h
@ -50,15 +73,7 @@ drwxr-xr-x root/root usr/include/apache/
-rw-r--r-- root/root usr/include/apache/mpm_common.h -rw-r--r-- root/root usr/include/apache/mpm_common.h
-rw-r--r-- root/root usr/include/apache/mpm_default.h -rw-r--r-- root/root usr/include/apache/mpm_default.h
-rw-r--r-- root/root usr/include/apache/os.h -rw-r--r-- root/root usr/include/apache/os.h
-rw-r--r-- root/root usr/include/apache/pcre.h
-rw-r--r-- root/root usr/include/apache/pcreposix.h
-rw-r--r-- root/root usr/include/apache/rfc1413.h
-rw-r--r-- root/root usr/include/apache/scoreboard.h -rw-r--r-- root/root usr/include/apache/scoreboard.h
-rw-r--r-- root/root usr/include/apache/ssl_expr.h
-rw-r--r-- root/root usr/include/apache/ssl_expr_parse.h
-rw-r--r-- root/root usr/include/apache/ssl_toolkit_compat.h
-rw-r--r-- root/root usr/include/apache/ssl_util_ssl.h
-rw-r--r-- root/root usr/include/apache/ssl_util_table.h
-rw-r--r-- root/root usr/include/apache/unixd.h -rw-r--r-- root/root usr/include/apache/unixd.h
-rw-r--r-- root/root usr/include/apache/util_cfgtree.h -rw-r--r-- root/root usr/include/apache/util_cfgtree.h
-rw-r--r-- root/root usr/include/apache/util_charset.h -rw-r--r-- root/root usr/include/apache/util_charset.h
@ -77,34 +92,48 @@ drwxr-xr-x root/root usr/lib/apache/build/
-rwxr-xr-x root/root usr/lib/apache/build/instdso.sh -rwxr-xr-x root/root usr/lib/apache/build/instdso.sh
-rw-r--r-- root/root usr/lib/apache/build/library.mk -rw-r--r-- root/root usr/lib/apache/build/library.mk
-rw-r--r-- root/root usr/lib/apache/build/ltlib.mk -rw-r--r-- root/root usr/lib/apache/build/ltlib.mk
-rwxr-xr-x root/root usr/lib/apache/build/mkdir.sh
-rw-r--r-- root/root usr/lib/apache/build/program.mk -rw-r--r-- root/root usr/lib/apache/build/program.mk
-rw-r--r-- root/root usr/lib/apache/build/rules.mk -rw-r--r-- root/root usr/lib/apache/build/rules.mk
-rw-r--r-- root/root usr/lib/apache/build/special.mk -rw-r--r-- root/root usr/lib/apache/build/special.mk
-rw-r--r-- root/root usr/lib/apache/httpd.exp -rw-r--r-- root/root usr/lib/apache/httpd.exp
-rwxr-xr-x root/root usr/lib/apache/mod_access.so
-rwxr-xr-x root/root usr/lib/apache/mod_actions.so -rwxr-xr-x root/root usr/lib/apache/mod_actions.so
-rwxr-xr-x root/root usr/lib/apache/mod_alias.so -rwxr-xr-x root/root usr/lib/apache/mod_alias.so
-rwxr-xr-x root/root usr/lib/apache/mod_asis.so -rwxr-xr-x root/root usr/lib/apache/mod_asis.so
-rwxr-xr-x root/root usr/lib/apache/mod_auth.so -rwxr-xr-x root/root usr/lib/apache/mod_auth_basic.so
-rwxr-xr-x root/root usr/lib/apache/mod_auth_anon.so
-rwxr-xr-x root/root usr/lib/apache/mod_auth_dbm.so
-rwxr-xr-x root/root usr/lib/apache/mod_auth_digest.so -rwxr-xr-x root/root usr/lib/apache/mod_auth_digest.so
-rwxr-xr-x root/root usr/lib/apache/mod_authn_anon.so
-rwxr-xr-x root/root usr/lib/apache/mod_authn_dbd.so
-rwxr-xr-x root/root usr/lib/apache/mod_authn_dbm.so
-rwxr-xr-x root/root usr/lib/apache/mod_authn_default.so
-rwxr-xr-x root/root usr/lib/apache/mod_authn_file.so
-rwxr-xr-x root/root usr/lib/apache/mod_authz_dbm.so
-rwxr-xr-x root/root usr/lib/apache/mod_authz_default.so
-rwxr-xr-x root/root usr/lib/apache/mod_authz_groupfile.so
-rwxr-xr-x root/root usr/lib/apache/mod_authz_host.so
-rwxr-xr-x root/root usr/lib/apache/mod_authz_owner.so
-rwxr-xr-x root/root usr/lib/apache/mod_authz_user.so
-rwxr-xr-x root/root usr/lib/apache/mod_autoindex.so -rwxr-xr-x root/root usr/lib/apache/mod_autoindex.so
-rwxr-xr-x root/root usr/lib/apache/mod_cern_meta.so -rwxr-xr-x root/root usr/lib/apache/mod_cern_meta.so
-rwxr-xr-x root/root usr/lib/apache/mod_cgi.so -rwxr-xr-x root/root usr/lib/apache/mod_cgi.so
-rwxr-xr-x root/root usr/lib/apache/mod_dav.so -rwxr-xr-x root/root usr/lib/apache/mod_dav.so
-rwxr-xr-x root/root usr/lib/apache/mod_dav_fs.so -rwxr-xr-x root/root usr/lib/apache/mod_dav_fs.so
-rwxr-xr-x root/root usr/lib/apache/mod_dbd.so
-rwxr-xr-x root/root usr/lib/apache/mod_deflate.so -rwxr-xr-x root/root usr/lib/apache/mod_deflate.so
-rwxr-xr-x root/root usr/lib/apache/mod_dir.so -rwxr-xr-x root/root usr/lib/apache/mod_dir.so
-rwxr-xr-x root/root usr/lib/apache/mod_dumpio.so
-rwxr-xr-x root/root usr/lib/apache/mod_env.so -rwxr-xr-x root/root usr/lib/apache/mod_env.so
-rwxr-xr-x root/root usr/lib/apache/mod_expires.so -rwxr-xr-x root/root usr/lib/apache/mod_expires.so
-rwxr-xr-x root/root usr/lib/apache/mod_ext_filter.so -rwxr-xr-x root/root usr/lib/apache/mod_ext_filter.so
-rwxr-xr-x root/root usr/lib/apache/mod_filter.so
-rwxr-xr-x root/root usr/lib/apache/mod_headers.so -rwxr-xr-x root/root usr/lib/apache/mod_headers.so
-rwxr-xr-x root/root usr/lib/apache/mod_imap.so -rwxr-xr-x root/root usr/lib/apache/mod_ident.so
-rwxr-xr-x root/root usr/lib/apache/mod_imagemap.so
-rwxr-xr-x root/root usr/lib/apache/mod_include.so -rwxr-xr-x root/root usr/lib/apache/mod_include.so
-rwxr-xr-x root/root usr/lib/apache/mod_info.so -rwxr-xr-x root/root usr/lib/apache/mod_info.so
-rwxr-xr-x root/root usr/lib/apache/mod_log_config.so -rwxr-xr-x root/root usr/lib/apache/mod_log_config.so
-rwxr-xr-x root/root usr/lib/apache/mod_log_forensic.so -rwxr-xr-x root/root usr/lib/apache/mod_log_forensic.so
-rwxr-xr-x root/root usr/lib/apache/mod_logio.so
-rwxr-xr-x root/root usr/lib/apache/mod_mime.so -rwxr-xr-x root/root usr/lib/apache/mod_mime.so
-rwxr-xr-x root/root usr/lib/apache/mod_mime_magic.so -rwxr-xr-x root/root usr/lib/apache/mod_mime_magic.so
-rwxr-xr-x root/root usr/lib/apache/mod_negotiation.so -rwxr-xr-x root/root usr/lib/apache/mod_negotiation.so
@ -128,6 +157,7 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/ab.8.gz -rw-r--r-- root/root usr/man/man8/ab.8.gz
-rw-r--r-- root/root usr/man/man8/apachectl.8.gz -rw-r--r-- root/root usr/man/man8/apachectl.8.gz
-rw-r--r-- root/root usr/man/man8/apxs.8.gz -rw-r--r-- root/root usr/man/man8/apxs.8.gz
-rw-r--r-- root/root usr/man/man8/htcacheclean.8.gz
-rw-r--r-- root/root usr/man/man8/httpd.8.gz -rw-r--r-- root/root usr/man/man8/httpd.8.gz
-rw-r--r-- root/root usr/man/man8/logresolve.8.gz -rw-r--r-- root/root usr/man/man8/logresolve.8.gz
-rw-r--r-- root/root usr/man/man8/rotatelogs.8.gz -rw-r--r-- root/root usr/man/man8/rotatelogs.8.gz
@ -140,6 +170,7 @@ drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/dbmmanage -rwxr-xr-x root/root usr/sbin/dbmmanage
-rw-r--r-- root/root usr/sbin/envvars -rw-r--r-- root/root usr/sbin/envvars
-rw-r--r-- root/root usr/sbin/envvars-std -rw-r--r-- root/root usr/sbin/envvars-std
-rwxr-xr-x root/root usr/sbin/htcacheclean
-rwxr-xr-x root/root usr/sbin/htdbm -rwxr-xr-x root/root usr/sbin/htdbm
-rwxr-xr-x root/root usr/sbin/htdigest -rwxr-xr-x root/root usr/sbin/htdigest
-rwxr-xr-x root/root usr/sbin/htpasswd -rwxr-xr-x root/root usr/sbin/htpasswd

6
apache/.md5sum
View File

@ -1,4 +1,4 @@
84a3d5bafe682aa10d75526cb4aef731 apache e0514e5840c0e58cc4e7982a7e14fc4b apache
ab96591dd7e71324f885ec0525162813 apache-ssl_cert.patch 9ba7f3dfdaea3e01fc6c7c80dbd77eaa apache-ssl_cert.patch
bd931fee9d102c361e95ad318d199674 crux.layout bd931fee9d102c361e95ad318d199674 crux.layout
b0200a497d1c89daad680c676d32a6df httpd-2.0.59.tar.bz2 887bf4a85505e97babe1d90635361c0d httpd-2.2.3.tar.bz2

14
apache/Pkgfile
View File

@ -1,19 +1,21 @@
# Description: Apache HTTP server version 2.0.x # Description: Apache HTTP server version 2.0.x
# Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de # Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de
# URL: http://httpd.apache.org/ # URL: http://httpd.apache.org/
# Depends on: apr, db, expat, gdbm, openssl, zlib # Depends on: apr, openssl, zlib
# Group: apache # Group: apache
name=apache name=apache
version=2.0.59 version=2.2.3
release=1 release=1
source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \ source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \
$name-ssl_cert.patch crux.layout apache) $name-ssl_cert.patch crux.layout apache)
build(){ build(){
cd httpd-$version cd httpd-$version
patch -p1 < $SRC/$name-ssl_cert.patch patch -p1 < $SRC/$name-ssl_cert.patch
cat $SRC/crux.layout >> config.layout cat $SRC/crux.layout >> config.layout
./configure --enable-layout=CRUX \ ./configure --enable-layout=CRUX \
--with-apr=/usr \ --with-apr=/usr \
--with-apr-util=/usr \ --with-apr-util=/usr \
@ -21,9 +23,6 @@ build(){
--enable-modules=all \ --enable-modules=all \
--enable-mods-shared=all \ --enable-mods-shared=all \
--enable-ssl \ --enable-ssl \
--enable-deflate \
--with-gdbm \
--with-expat=/usr \
--with-mpm=prefork --with-mpm=prefork
make make
make DESTDIR=$PKG install make DESTDIR=$PKG install
@ -33,7 +32,8 @@ build(){
touch $PKG/etc/ssl/certs/apache.crt touch $PKG/etc/ssl/certs/apache.crt
install -D -m 755 $SRC/apache $PKG/etc/rc.d/apache install -D -m 755 $SRC/apache $PKG/etc/rc.d/apache
rm -R $PKG/var/www/htdocs/* sed -ri '/^(User|Group)/s/daemon/www/' $PKG/etc/apache/httpd.conf
sed -i '1s|local/||' $PKG/var/www/cgi-bin/printenv
rm -R $PKG/{var/www/htdocs/*,usr/bin}
rm $PKG/var/www/{error,icons,icons/small}/README* rm $PKG/var/www/{error,icons,icons/small}/README*
chown -R root:root $PKG
} }

13
apache/README
View File

@ -1,13 +0,0 @@
README for apache 2.0.x
REQUIREMENTS
PRE-INSTALL
POST-INSTALL
As of version 2.0.55 the location of the apache SSL certificates
changed to /etc/ssl/certs/apache.crt and /etc/ssl/keys/apache.key
Don't reject the configuration file /etc/apache/ssl.conf !
PRECAUTION

4
apache/apache
View File

@ -3,8 +3,6 @@
# /etc/rc.d/apache: start/stop/restart apache HTTP server # /etc/rc.d/apache: start/stop/restart apache HTTP server
# #
#START=start
START=startssl
KEY=/etc/ssl/keys/apache.key KEY=/etc/ssl/keys/apache.key
CRT=/etc/ssl/certs/apache.crt CRT=/etc/ssl/certs/apache.crt
@ -13,7 +11,7 @@ start)
if [ ! -s $KEY -o ! -s $CRT ]; then if [ ! -s $KEY -o ! -s $CRT ]; then
/usr/bin/mksslcert $KEY $CRT /usr/bin/mksslcert $KEY $CRT
fi fi
/usr/sbin/apachectl $START /usr/sbin/apachectl start
;; ;;
stop) stop)
/usr/sbin/apachectl stop /usr/sbin/apachectl stop

20
apache/apache-ssl_cert.patch
View File

@ -1,21 +1,21 @@
diff -Nru httpd-2.0.55.orig/docs/conf/ssl-std.conf.in httpd-2.0.55/docs/conf/ssl-std.conf.in diff -Nru httpd-2.2.3.orig/docs/conf/extra/httpd-ssl.conf.in httpd-2.2.3/docs/conf/extra/httpd-ssl.conf.in
--- httpd-2.0.55.orig/docs/conf/ssl-std.conf.in 2005-10-15 09:54:54.000000000 +0200 --- httpd-2.2.3.orig/docs/conf/extra/httpd-ssl.conf.in 2006-11-25 10:10:32.723767703 +0100
+++ httpd-2.0.55/docs/conf/ssl-std.conf.in 2005-10-15 09:56:21.000000000 +0200 +++ httpd-2.2.3/docs/conf/extra/httpd-ssl.conf.in 2006-11-25 10:11:26.143767703 +0100
@@ -105,7 +105,7 @@ @@ -96,7 +96,7 @@
# in mind that if you have both an RSA and a DSA certificate you # in mind that if you have both an RSA and a DSA certificate you
# can configure both in parallel (to also allow the use of DSA # can configure both in parallel (to also allow the use of DSA
# ciphers, etc.) # ciphers, etc.)
-SSLCertificateFile @exp_sysconfdir@/ssl.crt/server.crt -SSLCertificateFile @exp_sysconfdir@/server.crt
+SSLCertificateFile /etc/ssl/certs/apache.crt +SSLCertificateFile /etc/ssl/certs/apache.crt
#SSLCertificateFile @exp_sysconfdir@/ssl.crt/server-dsa.crt #SSLCertificateFile @exp_sysconfdir@/server-dsa.crt
# Server Private Key: # Server Private Key:
@@ -113,7 +113,7 @@ @@ -104,7 +104,7 @@
# directive to point at the key file. Keep in mind that if # directive to point at the key file. Keep in mind that if
# you've both a RSA and a DSA private key you can configure # you've both a RSA and a DSA private key you can configure
# both in parallel (to also allow the use of DSA ciphers, etc.) # both in parallel (to also allow the use of DSA ciphers, etc.)
-SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server.key -SSLCertificateKeyFile @exp_sysconfdir@/server.key
+SSLCertificateKeyFile /etc/ssl/keys/apache.key +SSLCertificateFile /etc/ssl/keys/apache.key
#SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server-dsa.key #SSLCertificateKeyFile @exp_sysconfdir@/server-dsa.key
# Server Certificate Chain: # Server Certificate Chain: