the Fink project is an effort to port
popular Unix programs to Mac OS X
Package: apache2
Version: 2.0.59
Revision: 12
###
Replaces: apache2, apache2-ssl
Provides: httpd
BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-12), cyrus-sasl2-dev (>= 2.1.15-22), db44-aes | db44, expat1, openldap23-dev, libiconv-dev, system-openssl-dev, fink (>= 0.24.12)
Depends: %N-mpm-prefork (= %v-%r) | %N-mpm-worker (= %v-%r) | %N-mpm-perchild (= %v-%r) | %N-mpm-leader (= %v-%r) | %N-mpm-threadpool (= %v-%r)
###
CustomMirror: <<
Primary: http://www.apache.org/dist/httpd/
Secondary: http://www.apache.org/dist/httpd/old/
<<
###
Source: mirror:custom:httpd-%v.tar.bz2
Source-MD5: b0200a497d1c89daad680c676d32a6df
Source2: http://www.modssl.org/source/mod_ssl-2.8.26-1.3.35.tar.gz
Source2-MD5: c8eab590c6feb2eef800db29b0b22213
###
PatchFile: %n.patch
PatchFile-MD5: ff88baad783b399cbf688420190e9acb
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
### increase dynamic module load limit
perl -pi -e 's,DYNAMIC_MODULE_LIMIT 64,DYNAMIC_MODULE_LIMIT 96,g' include/httpd.h
### FIX LAYOUT
perl -pi -e 's,/usr/lib/cgi-bin,/lib/cgi-bin,g' config.layout
perl -pi -e 's,/usr/share/apache2/default-site/htdocs,/var/www/apache2-default,g' config.layout
perl -pi -e 's,/var/run,/var/run/apache2,g' config.layout
perl -pi -e 's,\$\{htdocsdir\}/manual,\$\{datadir\}/manual,g' config.layout
perl -pi -e 's,/etc/apache2/build,/share/apache2/build,g' config.layout
### Force use of awk over gawk
perl -pi -e 's,gawk mawk nawk awk,awk mawk nawk gawk,g' configure
<<
###
NoSetLDFLAGS: true
NoSetLIBS: true
SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib
###
DocFiles: ABOUT_APACHE LICENSE CHANGES INSTALL LAYOUT README* VERSIONING
###
CompileScript: <<
#!/bin/sh -ev
if [ -e %p/include/httpd.h ]; then
echo ""
echo "::: You have an OLD version of fink apache2 installed."
echo "::: Please \"fink remove apache2\" and retry!"
echo ""
exit 1
fi
<<
ConfigureParams: <<
--with-ldap=yes \
--with-ssl=/usr \
--enable-ssl=shared \
--enable-ldap=shared \
--enable-auth-ldap=shared \
--with-ldap-include=%p/include \
--with-ldap-lib=%p/lib \
--disable-dependency-tracking \
--with-apr=%p/bin/apr-config \
--with-apr-util=%p \
--enable-userdir=shared \
--enable-actions=shared \
--enable-auth-anon=shared \
--enable-auth-dbm=shared \
--enable-auth-digest=shared \
--enable-authn-dbm=shared \
--enable-authn-anon=shared \
--enable-authz-dbm=shared \
--enable-file-cache=shared \
--enable-cache=shared \
--enable-disk-cache=shared \
--enable-mem-cache=shared \
--enable-ext-filter=shared \
--enable-deflate=shared \
--enable-logio \
--enable-mime-magic=shared \
--enable-cern-meta=shared \
--enable-expires=shared \
--enable-headers=shared \
--enable-usertrack=shared \
--enable-unique-id=shared \
--enable-proxy=shared \
--enable-bucketeer=shared \
--enable-dav=shared \
--enable-info=shared \
--enable-include=shared \
--enable-suexec=shared \
--enable-cgi=shared \
--enable-cgid=shared \
--enable-dav_fs=shared \
--enable-vhost-alias=shared \
--enable-speling=shared \
--enable-rewrite=shared \
--enable-asis=shared \
--enable-imap=shared \
--enable-so \
--with-dbm=db44 \
--with-expat=%p \
--with-iconv=%p \
--with-gdbm=%p \
--with-berkeley-db=%p \
--enable-threads \
--enable-other-child \
--with-suexec-caller=www \
--with-suexec-userdir=Sites \
--with-suexec-bin=%p/lib/apache2/suexec2 \
--with-suexec-docroot=%p/var/www \
--with-suexec-logfile=%p/var/log/apache2/suexec.log \
--with-pic \
--enable-shared \
--enable-layout=Debian \
--prefix=%p \
--exec-prefix=%p \
--with-program-name=apache2
<<
InstallScript: <<
#!/bin/sh -ev
MPMS="prefork perchild worker leader threadpool";
for i in $MPMS;
do echo "Running ./configure --with-mpm=$i %c";
export ac_cv_func_poll=no; export AWK=/usr/bin/awk; export SED=/usr/bin/sed; ./configure --with-mpm=$i %c;
make;
make install DESTDIR=%d;
mv %i/sbin/apache2 apache2-$i;
mv %i/lib/apache2/modules/httpd.exp httpd.exp-$i;
cd server; make clean; cd -;
done
# old InstallScript began here
make install DESTDIR=%d
rm -rf %i/sbin/apache2
rm -rf %i/lib/apache2/modules/httpd.exp
for i in $MPMS;
do install -m 755 apache2-$i %i/sbin/;
install -m 755 httpd.exp-$i %i/lib/apache2/modules/;
done
# config stuff
rm -rf %i/etc/apache2/*.conf
# ssl stuff
cp fink/ssleay.cnf %i/share/apache2/ssleay.cnf
install -m 755 fink/ssl-certificate %i/sbin/apache2-ssl-certificate
# This is needed to apache and aache2 and co-exist
mkdir -p %i/etc/apache2/mods-available
mkdir -p %i/etc/apache2/mods-enabled
mkdir -p %i/etc/apache2/sites-available
mkdir -p %i/etc/apache2/sites-enabled
mkdir -p %i/etc/apache2/conf.d
mkdir -p %i/etc/apache2/ssl
mkdir -p %i/share/apache2/config
mkdir -p %i/var/lock/apache2
mkdir -p %i/var/cache/apache2/proxy
mkdir -p %i/var/log/apache2
mkdir -p %i/var/run/apache2
rm %i/share/man/man8/apachectl.8
rm %i/sbin/httxt2dbm
rm %i/share/man/man8/httpd.8
mv %i/sbin/dbmmanage %i/bin/dbmmanage
mv %i/sbin/htdbm %i/bin/htdbm
mv %i/sbin/htdigest %i/bin/htdigest
mv %i/sbin/htpasswd %i/bin/htpasswd
cp %b/support/check_forensic %i/sbin
chmod +x %i/sbin/check_forensic
cp %b/support/split-logfile %i/sbin
chmod +x %i/sbin/split-logfile
cp fink/checkgid.8 %i/share/man/man8/checkgid.8
cp fink/a2dismod.8 %i/share/man/man8/a2dismod.8
cp fink/a2enmod.8 %i/share/man/man8/a2enmod.8
cp fink/check_forensic.8 %i/share/man/man8/check_forensic.8
mv %i/sbin/apxs %i/bin/apxs2
perl -pi -e 's,get_vars\(\"sbindir\"\) \. \"/envvars\",\"%p/etc/apache2/envvars\",g' %i/bin/apxs2
mv %i/share/man/man8/apxs.8 %i/share/man/man8/apxs2.8
mv %i/sbin/apachectl %i/sbin/apache2ctl
mv %i/sbin/suexec %i/lib/apache2/suexec2
cp fink/apache2.8 %i/share/man/man8/apache2.8
cp fink/apache2ctl.8 %i/share/man/man8/apache2ctl.8
mv %i/share/man/man8/suexec.8 %i/share/man/man8/suexec2.8
mv %i/sbin/envvars* %i/share/apache2/build/
mv %i/share/apache2/build/envvars %i/etc/apache2/
cp fink/robots.txt %i/var/www/apache2-default/
cp -R fink/config-sites/* %i/share/apache2/config/
cp -R fink/config-mods/*.load %i/etc/apache2/mods-available/
cp -R fink/config-mods/*.conf %i/etc/apache2/mods-available/
cp -R fink/config/* %i/etc/apache2/
chmod +x %i/lib/cgi-bin/*
for i in `find fink/a2-scripts -name .svn -prune -o -name .arch-ids -prune -o -type f -print`;
do install -m755 $i %i/sbin/;
done
cp fink/default-site %i/etc/apache2/sites-available/default
cp fink/apache2-doc.conf %i/etc/apache2/conf.d/apache2-doc
chmod 4750 %i/lib/apache2/suexec2
mkdir -p %i/etc/logrotate.d
cp fink/logrotate %i/etc/logrotate.d/apache2
<<
###
SplitOff3: <<
Package: %N-common
Depends: daemonic, apache2-utils (= %v-%r)
Replaces: apache2 (<= 2.0.47-1), apache, apache2-common, apache2-ssl-common, apache2-ssl-dev (<= 2.0.47-4), libapache2-mod-auth-anon, libapache2-mod-cgid, libapache2-mod-expires, libapache2-mod-headers, libapache2-mod-info, libapache2-mod-mime-magic, libapache2-mod-proxy, libapache2-mod-proxy-connect, libapache2-mod-proxy-ftp, libapache2-mod-proxy-http, libapache2-mod-rewrite, libapache2-mod-speling, libapache2-mod-suexec, libapache2-mod-unique-id, libapache2-mod-usertrack, libapache2-mod-vhost-alias, libapache2-mod-auth-dbm, libapache2-mod-auth-digest, libapache2-mod-actions, libapache2-mod-bucketeer, libapache2-mod-isapi, libapache2-mod-ldap, libapache2-mod-auth-ldap, libapache2-mod-ssl, libapache2-ssl-mod-auth-anon, libapache2-ssl-mod-cgid, libapache2-ssl-mod-expires, libapache2-ssl-mod-headers, libapache2-ssl-mod-info, libapache2-ssl-mod-mime-magic, libapache2-ssl-mod-proxy, libapache2-ssl-mod-proxy-connect, libapache2-ssl-mod-proxy-ftp, libapache2-ssl-mod-proxy-http, libapache2-ssl-mod-rewrite, libapache2-ssl-mod-speling, libapache2-ssl-mod-suexec, libapache2-ssl-mod-unique-id, libapache2-ssl-mod-usertrack, libapache2-ssl-mod-vhost-alias, libapache2-ssl-mod-auth-dbm, libapache2-ssl-mod-auth-digest, libapache2-ssl-mod-actions, libapache2-ssl-mod-bucketeer, libapache2-ssl-mod-isapi, libapache2-ssl-mod-ldap, libapache2-ssl-mod-auth-ldap, libapache2-ssl-mod-ssl
Conflicts: apache2 (<= 2.0.47-1), apache
ConfFiles: <<
%p/etc/logrotate.d/apache2
%p/share/apache2/ssleay.cnf
%p/etc/apache2/sites-available/default
%p/etc/apache2/envvars
%p/etc/apache2/apache2.conf
%p/etc/apache2/httpd.conf
%p/etc/apache2/ports.conf
%p/etc/apache2/magic
%p/etc/apache2/mime.types
%p/etc/apache2/mods-available/actions.load
%p/etc/apache2/mods-available/asis.load
%p/etc/apache2/mods-available/auth_anon.load
%p/etc/apache2/mods-available/auth_dbm.load
%p/etc/apache2/mods-available/auth_digest.load
%p/etc/apache2/mods-available/auth_ldap.load
%p/etc/apache2/mods-available/bucketeer.load
%p/etc/apache2/mods-available/cache.load
%p/etc/apache2/mods-available/cern_meta.load
%p/etc/apache2/mods-available/cgi.load
%p/etc/apache2/mods-available/cgid.load
%p/etc/apache2/mods-available/dav.load
%p/etc/apache2/mods-available/dav_fs.load
%p/etc/apache2/mods-available/deflate.load
%p/etc/apache2/mods-available/disk_cache.load
%p/etc/apache2/mods-available/expires.load
%p/etc/apache2/mods-available/ext_filter.load
%p/etc/apache2/mods-available/file_cache.load
%p/etc/apache2/mods-available/headers.load
%p/etc/apache2/mods-available/imap.load
%p/etc/apache2/mods-available/include.load
%p/etc/apache2/mods-available/info.load
%p/etc/apache2/mods-available/ldap.load
%p/etc/apache2/mods-available/mem_cache.load
%p/etc/apache2/mods-available/mime_magic.load
%p/etc/apache2/mods-available/proxy.load
%p/etc/apache2/mods-available/proxy_connect.load
%p/etc/apache2/mods-available/proxy_ftp.load
%p/etc/apache2/mods-available/proxy_http.load
%p/etc/apache2/mods-available/rewrite.load
%p/etc/apache2/mods-available/speling.load
%p/etc/apache2/mods-available/ssl.load
%p/etc/apache2/mods-available/suexec.load
%p/etc/apache2/mods-available/unique_id.load
%p/etc/apache2/mods-available/userdir.load
%p/etc/apache2/mods-available/usertrack.load
%p/etc/apache2/mods-available/vhost_alias.load
%p/etc/apache2/mods-available/cgid.conf
%p/etc/apache2/mods-available/dav_fs.conf
%p/etc/apache2/mods-available/mime_magic.conf
%p/etc/apache2/mods-available/proxy.conf
%p/etc/apache2/mods-available/ssl.conf
%p/etc/apache2/mods-available/userdir.conf
<<
Files: <<
etc
lib/cgi-bin
share/apache2/icons
share/apache2/error
share/apache2/build
share/apache2/config
var/www
var/log
var/run
var/lock
var/cache
sbin/apache2ctl
share/man/man8/apache2.8
share/man/man8/apache2ctl.8
share/man/man8/suexec2.8
share/man/man8/a2enmod.8
share/man/man8/a2dismod.8
share/apache2/ssleay.cnf
sbin/a2dismod
sbin/a2enmod
sbin/a2dissite
sbin/a2ensite
sbin/modhandler.py
sbin/update-apache2-modules
sbin/apache2-ssl-certificate
lib/apache2/suexec2
lib/apache2/modules/mod_actions.so
lib/apache2/modules/mod_asis.so
lib/apache2/modules/mod_auth_anon.so
lib/apache2/modules/mod_auth_dbm.so
lib/apache2/modules/mod_auth_digest.so
lib/apache2/modules/mod_auth_ldap.so
lib/apache2/modules/mod_bucketeer.so
lib/apache2/modules/mod_cache.so
lib/apache2/modules/mod_cern_meta.so
lib/apache2/modules/mod_cgi.so
lib/apache2/modules/mod_cgid.so
lib/apache2/modules/mod_dav.so
lib/apache2/modules/mod_dav_fs.so
lib/apache2/modules/mod_deflate.so
lib/apache2/modules/mod_disk_cache.so
lib/apache2/modules/mod_expires.so
lib/apache2/modules/mod_ext_filter.so
lib/apache2/modules/mod_file_cache.so
lib/apache2/modules/mod_headers.so
lib/apache2/modules/mod_imap.so
lib/apache2/modules/mod_include.so
lib/apache2/modules/mod_info.so
lib/apache2/modules/mod_ldap.so
lib/apache2/modules/mod_mem_cache.so
lib/apache2/modules/mod_mime_magic.so
lib/apache2/modules/mod_proxy.so
lib/apache2/modules/mod_proxy_connect.so
lib/apache2/modules/mod_proxy_ftp.so
lib/apache2/modules/mod_proxy_http.so
lib/apache2/modules/mod_rewrite.so
lib/apache2/modules/mod_speling.so
lib/apache2/modules/mod_ssl.so
lib/apache2/modules/mod_suexec.so
lib/apache2/modules/mod_unique_id.so
lib/apache2/modules/mod_userdir.so
lib/apache2/modules/mod_usertrack.so
lib/apache2/modules/mod_vhost_alias.so
<<
DocFiles: ABOUT_APACHE LICENSE CHANGES INSTALL LAYOUT README* VERSIONING
DaemonicName: apache2
DaemonicFile: <<
<<
PreInstScript: <<
set -e
if [ -f %p/etc/apache2/httpd.conf ]; then
echo ""
echo "WARNING: the modules and base directory have changed. This will"
echo " affect the logs, htdocs, cgi-bin, etc directories. You"
echo " *MUST* update your config files, by choosing 'Y' at the"
echo " conf file update prompt, or by updating your current conf"
echo " conf files to reflect the changes."
echo ""
/bin/echo "Do you want to continue [Y/n] ? \c";
read CONTINUECHOICE
case $CONTINUECHOICE in
y|Y|'' ) ;;
* ) exit 1 ;;
esac
fi
exit 0
<<
PostInstScript: <<
set -e
if [ "$1" != "configure" ]; then
exit 0
fi
#set up default site and dummy error and access logs
if [ "$2" = "
if [ ! -L %p/etc/apache2/sites-enabled/000-default -a \
! -f %p/etc/apache2/sites-enabled/000-default ]; then
ln -s %p/etc/apache2/sites-available/default %p/etc/apache2/sites-enabled/000-default
fi
touch %p/var/log/apache2/error.log %p/var/log/apache2/access.log
chown root:admin %p/var/log/apache2/error.log %p/var/log/apache2/access.log
chmod 0640 %p/var/log/apache2/error.log %p/var/log/apache2/access.log
if [ ! -f %p/etc/apache2/conf.d/charset ]; then
echo "AddDefaultCharset UTF-8" > %p/etc/apache2/conf.d/charset
fi
fi
chown -R root:www %p/var/lock/apache2
chown -R root:www %p/var/cache/apache2
chown -R root:www %p/var/log/apache2
chown -R root:www %p/var/run/apache2
chown root:www %p/lib/apache2/suexec2
exit 0
<<
PostRmScript: <<
set -e
if [ "$1" = "purge" ]
then
rm -rf %p/var/cache/apache2
rm -rf %p/var/lib/apache2
rm -rf %p/var/log/apache2
rm -rf %p/var/lock/apache2
rm -rf %p/var/run/apache2
# /etc mess
rm -f %p/etc/default/apache2
rm -f %p/etc/apache2/ports.conf
rm -f %p/etc/apache2/httpd.conf
rm -f %p/etc/apache2/conf.d/charset
for i in `find %p/etc/apache2 -type l`; do
rm -f "$i"
done
fi
exit 0
<<
Description: Next generation, scalable, extendable web server
DescDetail: <<
Apache v2 is the next generation of the omnipresent Apache web server. This
version - a total rewrite - introduces many new improvements, such as
threading, a new API, IPv6 support, request/response filtering, and more.
.
It is also considerably faster, and can be easily extended to provide services
other than http.
.
This package contains all the standard apache2 modules, including SSL support.
However, it does *not* include the server itself; for this you need to
install one of the apache2-mpm-* packages; such as worker or prefork.
<<
<<
###
SplitOff101: <<
Package: apache-utils
Depends: apache2-utils (= %v-%r)
DocFiles: LICENSE
<<
SplitOff100: <<
Package: %N-utils
Depends: cyrus-sasl2-shlibs, db44-aes-shlibs | db44-shlibs, expat1-shlibs, libapr0-shlibs, libaprutil0-shlibs, libiconv, openldap23-shlibs (>= 2.3.24-10)
Replaces: apache2, apache2-ssl, apache2-common, apache2-ssl-common
Files: <<
bin/dbmmanage
bin/htdbm
bin/htdigest
bin/htpasswd
sbin/ab
sbin/check_forensic
sbin/checkgid
sbin/logresolve
sbin/split-logfile
sbin/rotatelogs
share/man/man1/htpasswd.1
share/man/man1/dbmmanage.1
share/man/man1/htdigest.1
share/man/man1/htdbm.1
share/man/man8/checkgid.8
share/man/man8/logresolve.8
share/man/man8/rotatelogs.8
share/man/man8/ab.8
share/man/man8/check_forensic.8
<<
DocFiles: LICENSE
Description: Utility programs for webservers
DescDetail: <<
Provides some add-on programs useful for any webserver. These include:
- ab (Apache benchmark tool)
- logresolve (Resolve IP addresses to hostname in logfiles)
- htpasswd (Manipulate basic authentication files)
- htdigest (Manipulate digest authentication files)
- dbmmanage (Manipulate basic authentication files in DBM format, using perl)
- htdbm (Manipulate basic authentication files in DBM format, using APR)
- rotatelogs (Periodically stop writing to a logfile and open a new one)
- split-logfile (Split a single log including multiple vhosts)
- checkgid (Checks whether the caller can setgid to the specified group)
- check_forensic (Extract mod_log_forensic output from apache log files)
<<
<<
SplitOff2: <<
Package: %N-dev
Description: Apache2 Developement Files
Depends: %N-common (= %v-%r)
Replaces: apache2 (<= 2.0.47-1), apache, apache-dev, apache2-dev, apache2-ssl-dev
Conflicts: apache2 (<= 2.0.47-1), apache, apache-dev
Files: <<
include/apache2
bin/apxs2
share/man/man8/apxs2.8
<<
DocFiles: LICENSE
<<
###
SplitOff: <<
Package: %N-docs
Description: Apache2 Manual
Replaces: apache2 (<= 2.0.47-1), apache-docs, apache2-docs, apache2-ssl-docs
Conflicts: apache2 (<= 2.0.47-1), apache-docs
ConfFiles: %p/etc/apache2/conf.d/apache2-doc
Files: <<
share/apache2/manual
etc/apache2/conf.d/apache2-doc
<<
DocFiles: LICENSE
<<
###
SplitOff4: <<
Package: libapache2-mod-auth-anon
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff5: <<
Package: libapache2-mod-cgid
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff6: <<
Package: libapache2-mod-expires
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff7: <<
Package: libapache2-mod-headers
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff8: <<
Package: libapache2-mod-info
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff9: <<
Package: libapache2-mod-mime-magic
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
Docfiles: LICENSE
<<
SplitOff10: <<
Package: libapache2-mod-proxy
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff11: <<
Package: libapache2-mod-proxy-connect
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff12: <<
Package: libapache2-mod-proxy-ftp
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff13: <<
Package: libapache2-mod-proxy-http
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff14: <<
Package: libapache2-mod-rewrite
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff15: <<
Package: libapache2-mod-speling
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff16: <<
Package: libapache2-mod-suexec
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff17: <<
Package: libapache2-mod-unique-id
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff18: <<
Package: libapache2-mod-usertrack
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff19: <<
Package: libapache2-mod-vhost-alias
Depends: apache2-common (=%v-%r)
DocFiles: LICENSE
<<
SplitOff20: <<
Package: libapache2-mod-auth-dbm
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff21: <<
Package: libapache2-mod-auth-digest
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff22: <<
Package: libapache2-mod-actions
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff23: <<
Package: libapache2-mod-bucketeer
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff24: <<
Package: libapache2-mod-isapi
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff30: <<
Package: libapache2-mod-ldap
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff31: <<
Package: libapache2-mod-auth-ldap
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff32: <<
Package: libapache2-mod-ssl
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
###
SplitOff25: <<
Package: %N-mpm-prefork
Description: Apache2 Server Binary - [MPM PREFORK *RECOMMENDED*]
DescDetail: <<
Implements a non-threaded, pre-forking web server
Summary
This Multi-Processing Module (MPM) implements a non-threaded, pre-forking
web server that handles requests in a manner similar to Apache 1.3. It is
appropriate for sites that need to avoid threading for compatibility with
non-thread-safe libraries. It is also the best MPM for isolating each
request, so that a problem with a single request will not affect any other.
<<
Depends: cyrus-sasl2-shlibs (>= 2.1.15-22), db44-aes-shlibs | db44-shlibs, libaprutil0-shlibs, libapr0-shlibs, openldap23-shlibs (>= 2.3.24-10), %N-common (= %v-%r), expat1-shlibs, libiconv
Replaces: apache2 (<= 2.0.47-1), apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild, apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork, apache2-ssl-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-leader, apache2-mpm-threadpool
Files: <<
sbin/apache2-prefork
lib/apache2/modules/httpd.exp-prefork
<<
DocFiles: LICENSE
PostInstScript: <<
set -e
if [ "$1" = "upgrade" ]; then
%p/bin/daemonic update apache2
%p/sbin/apache2ctl restart
fi
update-alternatives --install %p/sbin/apache2 apache2 %p/sbin/apache2-prefork 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp %p/lib/apache2/modules/httpd.exp-prefork 60
%p/bin/daemonic enable apache2
if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
then
%p/sbin/apache2ctl restart
fi
exit 0
<<
PreRmScript: <<
set -e
if [ $1 != "upgrade" ]
then
%p/sbin/apache2ctl stop
%p/bin/daemonic disable apache2
update-alternatives --remove apache2 %p/sbin/apache2-prefork
update-alternatives --remove httpd.exp %p/lib/apache2/modules/httpd.exp-prefork
fi
exit 0
<<
<<
###
SplitOff26: <<
Package: %N-mpm-perchild
Description: Apache2 Server Binary - [MPM PERCHILD *EXPERIMENTAL*]
DescDetail: <<
Multi-Processing Module allowing for daemon processes serving requests
to be assigned a variety of different userids
Summary
This MPM does not currently work on most platforms. Work is ongoing to
make it functional.
This Multi-Processing Module (MPM) implements a hybrid multi-process,
multi-threaded web server. A fixed number of processes create threads to
handle requests. Fluctuations in load are handled by increasing or
decreasing the number of threads in each process.
Experimental High speed perchild threaded model for Apache2 Perchild is
the grown up, mac daddy version of suexec for apache2. Rather than execute
a cgi script as a given user, perchild forks a process for each vhost, then
su's to the correct user/group for that vhost.
Each process then uses a thread model similar to that of the worker mpm.
THIS MPM IS NOT CURRENTLY EXPECTED TO WORK CORRECTLY, IF AT ALL. IT IS
UNDER VERY HEAVY DEVELOPMENT.
This mpm is still highly experimental, and should be used with care.
<<
Depends: cyrus-sasl2-shlibs (>= 2.1.15-22), db44-aes-shlibs | db44-shlibs, libaprutil0-shlibs, libapr0-shlibs, openldap23-shlibs (>= 2.3.24-10), %N-common (= %v-%r), expat1-shlibs, libiconv
Replaces: apache2 (<= 2.0.47-1), apache2-ssl-mpm-worker, apache2-ssl-mpm-prefork, apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork, apache2-ssl-mpm-perchild
Conflicts: apache2 (<= 2.0.47-1), apache2-mpm-worker, apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Files: <<
sbin/apache2-perchild
lib/apache2/modules/httpd.exp-perchild
<<
DocFiles: LICENSE
PostInstScript: <<
set -e
if [ "$1" = "upgrade" ]; then
%p/bin/daemonic update apache2
%p/sbin/apache2ctl restart
fi
update-alternatives --install %p/sbin/apache2 apache2 %p/sbin/apache2-perchild 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp %p/lib/apache2/modules/httpd.exp-perchild 60
%p/bin/daemonic enable apache2
if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
then
%p/sbin/apache2ctl restart
fi
exit 0
<<
PreRmScript: <<
set -e
if [ $1 != "upgrade" ]
then
%p/sbin/apache2ctl stop
%p/bin/daemonic disable apache2
update-alternatives --remove apache2 %p/sbin/apache2-perchild
update-alternatives --remove httpd.exp %p/lib/apache2/modules/httpd.exp-perchild
fi
exit 0
<<
<<
###
SplitOff27: <<
Package: %N-mpm-worker
Description: Apache2 Server Binary - [MPM WORKER]
DescDetail: <<
Multi-Processing Module implementing a hybrid multi-threaded multi-process
web server
Summary
This Multi-Processing Module (MPM) implements a hybrid multi-process
multi-threaded server. By using threads to serve requests, it is able to
serve a large number of requests with less system resources than a
process-based server. Yet it retains much of the stability of a
process-based server by keeping multiple processes available, each with
many threads.
<<
Depends: cyrus-sasl2-shlibs (>= 2.1.15-22), db44-aes-shlibs | db44-shlibs, libaprutil0-shlibs, libapr0-shlibs, openldap23-shlibs (>= 2.3.24-10), %N-common (= %v-%r), expat1-shlibs, libiconv
Replaces: apache2 (<= 2.0.47-1), apache2-ssl-mpm-prefork, apache2-ssl-mpm-perchild, apache2-ssl-mpm-leader, apache2-ssl-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork, apache2-ssl-mpm-worker
Conflicts: apache2 (<= 2.0.47-1),apache2-mpm-perchild, apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Files: <<
sbin/apache2-worker
lib/apache2/modules/httpd.exp-worker
<<
DocFiles: LICENSE
PostInstScript: <<
set -e
if [ "$1" = "upgrade" ]; then
%p/bin/daemonic update apache2
%p/sbin/apache2ctl restart
fi
update-alternatives --install %p/sbin/apache2 apache2 %p/sbin/apache2-worker 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp %p/lib/apache2/modules/httpd.exp-worker 60
%p/bin/daemonic enable apache2
if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
then
%p/sbin/apache2ctl restart
fi
exit 0
<<
PreRmScript: <<
set -e
if [ $1 != "upgrade" ]
then
%p/sbin/apache2ctl stop
%p/bin/daemonic disable apache2
update-alternatives --remove apache2 %p/sbin/apache2-worker
update-alternatives --remove httpd.exp %p/lib/apache2/modules/httpd.exp-worker
fi
exit 0
<<
<<
###
SplitOff28: <<
Package: %N-mpm-leader
Description: Apache2 Server Binary - [MPM LEADER *EXPERIMENTAL*]
DescDetail: <<
An experimental variant of the standard worker MPM
Summary
The leader MPM provides a threaded implementation for Apache2. It is
considerably faster than the traditional model, but has not currently
received as much testing. An experimental variant of the standard worker
MPM.
<<
Depends: cyrus-sasl2-shlibs (>= 2.1.15-22), db44-aes-shlibs | db44-shlibs, libaprutil0-shlibs, libapr0-shlibs, openldap23-shlibs (>= 2.3.24-10), %N-common (= %v-%r), expat1-shlibs, libiconv
Replaces: apache2 (<= 2.0.47-1), apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild, apache2-ssl-mpm-prefork, apache2-ssl-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork, apache2-ssl-mpm-leader
Conflicts: apache2 (<= 2.0.47-1), apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-threadpool, apache2-mpm-prefork
Files: <<
sbin/apache2-leader
lib/apache2/modules/httpd.exp-leader
<<
DocFiles: LICENSE
PostInstScript: <<
set -e
if [ "$1" = "upgrade" ]; then
%p/bin/daemonic update apache2
%p/sbin/apache2ctl restart
fi
update-alternatives --install %p/sbin/apache2 apache2 %p/sbin/apache2-leader 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp %p/lib/apache2/modules/httpd.exp-leader 60
%p/bin/daemonic enable apache2
if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
then
%p/sbin/apache2ctl restart
fi
exit 0
<<
PreRmScript: <<
set -e
if [ $1 != "upgrade" ]
then
%p/sbin/apache2ctl stop
%p/bin/daemonic disable apache2
update-alternatives --remove apache2 %p/sbin/apache2-leader
update-alternatives --remove httpd.exp %p/lib/apache2/modules/httpd.exp-leader
fi
exit 0
<<
<<
###
SplitOff29: <<
Package: %N-mpm-threadpool
Description: Apache2 Server Binary - [MPM THREADPOOL *EXPERIMENTAL*]
DescDetail: <<
Yet another experimental variant of the standard worker MPM
Warning
This MPM is a developer playground and highly experimental, so it may or
may not work as expected.
Experimental High speed thread pool model for Apache2. A variant of the
standard worker MPM.
Rather than queuing connections like the worker MPM, the threadpool MPM
queues idle worker threads and hands each accepted connection to the next
available worker.
The threadpool MPM can't match the performance of the worker MPM in
benchmark testing. As of 2.0.39, some of the key load-throtting concepts
from the threadpool MPM have been incorporated into the worker MPM. The
threadpool code is useful primarily as a research platform. For
general-purpose use and for any production environments, use worker instead.
<<
Depends: cyrus-sasl2-shlibs (>= 2.1.15-22), db44-aes-shlibs | db44-shlibs, libaprutil0-shlibs, libapr0-shlibs, openldap23-shlibs (>= 2.3.24-10), %N-common (= %v-%r), expat1-shlibs, libiconv
Replaces: apache2 (<= 2.0.47-1), apache2-ssl-mpm-worker, apache2-ssl-mpm-perchild, apache2-ssl-mpm-leader, apache2-ssl-mpm-prefork, apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork, apache2-ssl-mpm-threadpool
Conflicts: apache2 (<= 2.0.47-1), apache2-mpm-worker, apache2-mpm-perchild, apache2-mpm-leader, apache2-mpm-prefork
Files: <<
sbin/apache2-threadpool
lib/apache2/modules/httpd.exp-threadpool
<<
DocFiles: LICENSE
PostInstScript: <<
set -e
if [ "$1" = "upgrade" ]; then
%p/bin/daemonic update apache2
%p/sbin/apache2ctl restart
fi
update-alternatives --install %p/sbin/apache2 apache2 %p/sbin/apache2-threadpool 60
update-alternatives --install %p/lib/apache2/modules/httpd.exp httpd.exp %p/lib/apache2/modules/httpd.exp-threadpool 60
%p/bin/daemonic enable apache2
if [ -f /Library/StartupItems/daemonic-apache2/daemonic-apache2 ]
then
%p/sbin/apache2ctl restart
fi
exit 0
<<
PreRmScript: <<
set -e
if [ $1 != "upgrade" ]
then
%p/sbin/apache2ctl stop
%p/bin/daemonic disable apache2
update-alternatives --remove apache2 %p/sbin/apache2-threadpool
update-alternatives --remove httpd.exp %p/lib/apache2/modules/httpd.exp-
threadpool
fi
exit 0
<<
<<
SplitOff50: <<
Package: apache2-ssl
Depends: apache2 (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2 instead
DocFiles: LICENSE
<<
SplitOff51: <<
Package: apache2-ssl-common
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff52: <<
Package: apache2-ssl-dev
Depends: apache2-dev (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-dev instead
DocFiles: LICENSE
<<
SplitOff53: <<
Package: apache2-ssl-docs
Depends: apache2-docs (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-docs instead
DocFiles: LICENSE
<<
SplitOff54: <<
Package: libapache2-ssl-mod-auth-anon
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff55: <<
Package: libapache2-ssl-mod-cgid
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff56: <<
Package: libapache2-ssl-mod-expires
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff57: <<
Package: libapache2-ssl-mod-headers
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff58: <<
Package: libapache2-ssl-mod-info
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff59: <<
Package: libapache2-ssl-mod-mime-magic
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
Docfiles: LICENSE
<<
SplitOff60: <<
Package: libapache2-ssl-mod-proxy
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff61: <<
Package: libapache2-ssl-mod-proxy-connect
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff62: <<
Package: libapache2-ssl-mod-proxy-ftp
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff63: <<
Package: libapache2-ssl-mod-proxy-http
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff64: <<
Package: libapache2-ssl-mod-rewrite
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff65: <<
Package: libapache2-ssl-mod-speling
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff66: <<
Package: libapache2-ssl-mod-suexec
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff67: <<
Package: libapache2-ssl-mod-unique-id
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff68: <<
Package: libapache2-ssl-mod-usertrack
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff69: <<
Package: libapache2-ssl-mod-vhost-alias
Depends: apache2-common (=%v-%r)
DocFiles: LICENSE
<<
SplitOff70: <<
Package: libapache2-ssl-mod-auth-dbm
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff71: <<
Package: libapache2-ssl-mod-auth-digest
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff72: <<
Package: libapache2-ssl-mod-actions
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff73: <<
Package: libapache2-ssl-mod-bucketeer
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff74: <<
Package: libapache2-ssl-mod-isapi
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff75: <<
Package: apache2-ssl-mpm-prefork
Depends: apache2-mpm-prefork (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-mpm-prefork instead
DocFiles: LICENSE
<<
SplitOff76: <<
Package: apache2-ssl-mpm-perchild
Depends: apache2-mpm-perchild (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-mpm-perchild instead
DocFiles: LICENSE
<<
SplitOff77: <<
Package: apache2-ssl-mpm-worker
Depends: apache2-mpm-worker (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-mpm-worker instead
DocFiles: LICENSE
<<
SplitOff78: <<
Package: apache2-ssl-mpm-leader
Depends: apache2-mpm-leader (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-mpm-leader instead
DocFiles: LICENSE
<<
SplitOff79: <<
Package: apache2-ssl-mpm-threadpool
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff80: <<
Package: libapache2-ssl-mod-ldap
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff81: <<
Package: libapache2-ssl-mod-auth-ldap
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
SplitOff82: <<
Package: libapache2-ssl-mod-ssl
Depends: apache2-common (= %v-%r), fink-obsolete-packages
Description: OBSOLETE use apache2-common instead
DocFiles: LICENSE
<<
###
Description: Next generation, extendable web server
DescDetail: <<
Apache v2 is the next generation of the omnipresent Apache web server. This
version - a total rewrite - introduces many new improvements, such as
threading, a new API, IPv6 support, request/response filtering, and more.
<<
License: BSD
Homepage: http://www.apache.org
Maintainer: Dustin Sias
diff -ruN httpd-2.0.58.orig/fink/a2-scripts/a2dismod httpd-2.0.58/fink/a2-scripts/a2dismod
--- httpd-2.0.58.orig/fink/a2-scripts/a2dismod 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/a2-scripts/a2dismod 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+SYSCONFDIR='@FINKPREFIX@/etc/apache2'
+
+if [ -z $1 ]; then
+ echo "Which module would you like to disable?"
+ /bin/echo "Your choices are: \c"
+ ls $SYSCONFDIR/mods-enabled/*.load | \
+ sed -e "s,$SYSCONFDIR/mods-enabled/,,g" | sed -e 's/\.load$//g;' | xargs echo
+ /bin/echo "Module name? \c"
+ read MODNAME
+else
+ MODNAME=$1
+fi
+
+if ! [ -e $SYSCONFDIR/mods-enabled/$MODNAME.load ]; then
+ echo "This module is already disabled, or does not exist!"
+ exit 1
+fi
+
+rm -f $SYSCONFDIR/mods-enabled/$MODNAME.*
+echo "Module $MODNAME disabled; run @FINKPREFIX@/sbin/apache2ctl restart to fully disable."
diff -ruN httpd-2.0.58.orig/fink/a2-scripts/a2dissite httpd-2.0.58/fink/a2-scripts/a2dissite
--- httpd-2.0.58.orig/fink/a2-scripts/a2dissite 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/a2-scripts/a2dissite 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+
+SYSCONFDIR='@FINKPREFIX@/etc/apache2'
+
+if [ -z $1 ]; then
+ echo "Which site would you like to disable?"
+ /bin/echo "Your choices are: \c"
+ ls @FINKPREFIX@/etc/apache2/sites-enabled/* | \
+ sed -e "s,$SYSCONFDIR/sites-enabled/,,g" | xargs echo
+ /bin/echo "Site name? \c"
+ read SITENAME
+else
+ SITENAME=$1
+fi
+
+if [ $SITENAME = "default" ]; then
+ PRIORITY="000"
+fi
+
+if ! [ -e $SYSCONFDIR/sites-enabled/$SITENAME -o \
+ -e $SYSCONFDIR/sites-enabled/"$PRIORITY"-"$SITENAME" ]; then
+ echo "This site is already disabled, or does not exist!"
+ exit 1
+fi
+
+if ! rm $SYSCONFDIR/sites-enabled/$SITENAME 2>/dev/null; then
+ rm -f $SYSCONFDIR/sites-enabled/"$PRIORITY"-"$SITENAME"
+fi
+echo "Site $SITENAME disabled; run @FINKPREFIX@/sbin/apache2ctl restart to fully disable."
diff -ruN httpd-2.0.58.orig/fink/a2-scripts/a2enmod httpd-2.0.58/fink/a2-scripts/a2enmod
--- httpd-2.0.58.orig/fink/a2-scripts/a2enmod 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/a2-scripts/a2enmod 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,41 @@
+#!/bin/sh -e
+
+SYSCONFDIR='@FINKPREFIX@/etc/apache2'
+
+if [ -z $1 ]; then
+ echo "Which module would you like to enable?"
+ /bin/echo "Your choices are: \c"
+ ls @FINKPREFIX@/etc/apache2/mods-available/*.load | \
+ sed -e "s,$SYSCONFDIR/mods-available/,,g" | sed -e 's/\.load$//g;' | xargs echo
+ /bin/echo "Module name? \c"
+ read MODNAME
+else
+ MODNAME=$1
+fi
+
+#figure out if we're on a prefork or threaded mpm
+if [ -x @FINKPREFIX@/sbin/apache2 ]; then
+ PREFORK=`@FINKPREFIX@/sbin/apache2 -l | grep prefork || true`
+fi
+
+if [ $MODNAME = "cgi" ] && [ -z $PREFORK ]; then
+ MODNAME="cgid"
+fi
+
+if [ -e $SYSCONFDIR/mods-enabled/$MODNAME.load ]; then
+ echo "This module is already enabled!"
+ exit 0
+fi
+
+if ! [ -e $SYSCONFDIR/mods-available/$MODNAME.load ]; then
+ echo "This module does not exist!"
+ exit 1
+fi
+
+for i in conf load; do
+ if [ -e $SYSCONFDIR/mods-available/$MODNAME.$i -a ! -e $SYSCONFDIR/mods-enabled/$MODNAME.$i ]; then
+ ln -sf $SYSCONFDIR/mods-available/$MODNAME.$i $SYSCONFDIR/mods-enabled/$MODNAME.$i;
+ fi
+done
+
+echo "Module $MODNAME installed; run @FINKPREFIX@/sbin/apache2ctl restart to enable."
diff -ruN httpd-2.0.58.orig/fink/a2-scripts/a2ensite httpd-2.0.58/fink/a2-scripts/a2ensite
--- httpd-2.0.58.orig/fink/a2-scripts/a2ensite 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/a2-scripts/a2ensite 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,38 @@
+#!/bin/sh -e
+
+SYSCONFDIR='@FINKPREFIX@/etc/apache2'
+
+if [ -z $1 ]; then
+ echo "Which site would you like to enable?"
+ /bin/echo "Your choices are: \c"
+ ls $SYSCONFDIR/sites-available/* | \
+ sed -e "s,$SYSCONFDIR/sites-available/,,g" | xargs echo
+ /bin/echo "Site name? \c"
+ read SITENAME
+else
+ SITENAME=$1
+fi
+
+if [ $SITENAME = "default" ]; then
+ PRIORITY="000"
+fi
+
+if [ -e $SYSCONFDIR/sites-enabled/$SITENAME -o \
+ -e $SYSCONFDIR/sites-enabled/"$PRIORITY"-"$SITENAME" ]; then
+ echo "This site is already enabled!"
+ exit 0
+fi
+
+if ! [ -e $SYSCONFDIR/sites-available/$SITENAME ]; then
+ echo "This site does not exist!"
+ exit 1
+fi
+
+if [ $SITENAME = "default" ]; then
+ ln -sf $SYSCONFDIR/sites-available/$SITENAME \
+ $SYSCONFDIR/sites-enabled/"$PRIORITY"-"$SITENAME"
+else
+ ln -sf $SYSCONFDIR/sites-available/$SITENAME $SYSCONFDIR/sites-enabled/$SITENAME
+fi
+
+echo "Site $SITENAME installed; run @FINKPREFIX@/sbin/apache2ctl restart to enable."
diff -ruN httpd-2.0.58.orig/fink/a2-scripts/modhandler.py httpd-2.0.58/fink/a2-scripts/modhandler.py
--- httpd-2.0.58.orig/fink/a2-scripts/modhandler.py 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/a2-scripts/modhandler.py 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,190 @@
+#!/usr/bin/env python
+# Copyright (C) Thom May 2002
+#All rights reserved.
+
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+
+#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#TODO: add --force option
+
+import shelve, textwrap
+
+__all__ = ["ModHandler", "ModHandlerException", "ModuleAlreadyExists", "NoSuchModule"]
+
+class ModHandlerException(Exception):
+ pass
+
+class ModuleAlreadyExists(ModHandlerException):
+ def __init__(self, name):
+ self.args = name
+ self.name = name
+
+class NoSuchModule(ModHandlerException):
+ def __init__(self, name):
+ self.args = name
+ self.name = name
+
+class ModHandler:
+ def __init__(self, db):
+ self.registry = shelve.open(db,"c",writeback=True)
+ self.revision = "$LastChangedRevision: 19 $"
+
+ def add(self,module,sequence=99,*dependencies):
+ """add(module[, sequence, *dependencies])
+
+ Add a module into the registry ready for enabling.
+ module is the name of the module
+ sequence is the sequence number of the module. The default is 99
+ any further arguments define dependencies for the module"""
+
+ if __debug__: print "The module is", module, "and the sequence number is",sequence,"\n"
+ state = "disabled"
+ #now we create a tuple
+ # name, sequence, state, [dependencies]
+ if len(dependencies) > 0:
+ entry = module, sequence, state, 0, dependencies
+ else:
+ entry = module, sequence, state, 0
+
+ if self.registry.has_key(module):
+ raise ModuleAlreadyExists(module)
+
+ self.registry[module] = entry
+ return 0
+
+ def dolist(self):
+ """dolist (no arguments)
+ lists all the current elements in the database."""
+
+ for key in self.registry.keys():
+ print textwrap.fill("The name of the key is %s and the data in the key is: %s" % (key , self.registry[key][:3]))
+ if len(self.registry[key]) > 4:
+ print textwrap.fill("The dependencies for %s are: %s\n" % (key , self.registry[key][4]))
+ if self.registry[key][3] > 0:
+ print textwrap.fill("%s is in use %s times\n" % (key, self.registry[key][3]))
+ print
+
+ def remove(self,module):
+ if __debug__: print "Plotting to remove",module,"\n"
+ try:
+ self.disable(module)
+ del self.registry[module]
+ if __debug__: print "Removed",module
+ except KeyError:
+ raise NoSuchModule(module)
+ return 0
+
+ def enable(self,module,isdependency=False,*dependseq):
+ """enable(module,[dependseq])
+
+ enable takes one or two arguments. in normal opperation, just the module
+ name is passed. When being run recursively to fix dependencies, the
+ dependency sequence of the depending module is also passed"""
+
+ try:
+ data = self.registry[module]
+ except KeyError:
+ raise NoSuchModule(module)
+
+ #now, we check to see if our sequence number is higher than the module that's depending on us
+ #if so, we bump our sequence number down to one less than the depending module
+ changedseqnum = True
+ seqnum = data[1]
+ if __debug__: print module+": seqnum "+str(seqnum)
+ if len(dependseq) > 0:
+ if __debug__: print module+": dependseq "+str(dependseq[0])
+ if int(seqnum) > int(dependseq[0]):
+ oldseqnum = seqnum
+ seqnum = int(dependseq[0])
+ seqnum = seqnum - 1
+ if __debug__:
+ print module +": punting old seqnum:",str(oldseqnum)," to new seqnum:",str(seqnum)
+ print "new seqnum:",str(seqnum)
+ #changedseqnum = True
+ else:
+ changedseqnum = False
+
+ #next, we need to load any dependencies.
+ #this is complicated by the need to get the sequence right.
+ if len(data) > 4:
+ dependencies = data[4]
+ if __debug__: print dependencies
+ for dependency in dependencies:
+ if __debug__: print dependency
+ returncode = self.enable(dependency,True,seqnum)
+ if __debug__: print returncode
+
+ #now, we check whether the module is loaded already
+ if data[2] == "enabled" and changedseqnum == False:
+ #nothing more to do.
+ return
+ else:
+ self.switchon(module,seqnum)
+
+ refcount = data[3]
+ if isdependency:
+ refcount += 1
+
+ #ok, nothing has broken. Only now do we update the module's status.
+ #it would be nice to provide some semblance of atomicity to the
+ #operation
+ if len(data) < 5:
+ newstatus = module, seqnum, "enabled", refcount
+ else:
+ newstatus = module, seqnum, "enabled", refcount, dependencies
+
+ self.registry[module] = newstatus
+
+ def disable(self,module):
+ """disable(module) marks a module as disabled"""
+
+ #this might require some form of refcounting so we can work out if any
+ #unneeded dependencies can be unloaded as well, for example with mod_dav
+ #and its providers, such as dav_fs or dav_svn - but not till the basic
+ #functionality works ;-)
+
+
+ try:
+ data = self.registry[module]
+ except KeyError:
+ raise NoSuchModule(module)
+ if data[2] == "disabled":
+ return
+
+ if __debug__: print "shutting",module,"down\n"
+
+ #try:
+ self.switchoff(module,data[1])
+
+ if len(data) < 4:
+ newstatus = module, data[1], "disabled"
+ else:
+ newstatus = module, data[1], "disabled", data[3]
+
+ self.registry[module] = newstatus
+
+ def version(self, versionnum):
+
+ print "The version of the client is",versionnum
+ print "The revision number of ModHandler is %s" % self.revision.strip('$').split(':')[1].strip()
+
+ def switchon(self,module,seqnum): pass
+
+ def switchoff(self,module): pass
diff -ruN httpd-2.0.58.orig/fink/a2-scripts/update-apache2-modules httpd-2.0.58/fink/a2-scripts/update-apache2-modules
--- httpd-2.0.58.orig/fink/a2-scripts/update-apache2-modules 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/a2-scripts/update-apache2-modules 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,154 @@
+#!/usr/bin/env python
+# Copyright (C) Thom May 2002
+#All rights reserved.
+
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+
+#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import getopt, sys, os
+from modhandler import *
+
+versionnum = 0.8
+class A2ModHandler(ModHandler):
+ def switchon(self,module,seqnum):
+ if __debug__: print "switching on %s%s" % (seqnum,module)
+ availloadstring = "@FINKPREFIX@/etc/apache2/mods-available/"+module+".load"
+ enableloadstring = "@FINKPREFIX@/etc/apache2/mods-enabled/"+str(seqnum)+module+".load"
+ availconfstring = "@FINKPREFIX@/etc/apache2/mods-available/"+module+".conf"
+ enableconfstring = "@FINKPREFIX@/etc/apache2/mods-enabled/"+str(seqnum)+module+".conf"
+ if os.path.exists(availloadstring) and not os.path.exists(enableloadstring):
+ os.symlink(availloadstring,enableloadstring)
+ else:
+ return
+
+ if os.path.exists(availconfstring) and not os.path.exists(enableconfstring):
+ os.symlink(availconfstring,enableconfstring)
+ else:
+ return
+
+
+ def switchoff(self,module,seqnum):
+ if __debug__: print "switching %s off" % (module,)
+
+ enableloadstring = "@FINKPREFIX@/etc/apache2/mods-enabled/"+str(seqnum)+module+".load"
+ enableconfstring = "@FINKPREFIX@/etc/apache2/mods-enabled/"+str(seqnum)+module+".conf"
+
+ if os.path.exists(enableloadstring):
+ os.unlink(enableloadstring)
+ else:
+ return
+
+ if os.path.exists(enableconfstring):
+ os.unlink(enableconfstring)
+ else:
+ return
+
+
+def main():
+ if len(sys.argv) == 1:
+ usage()
+ sys.exit(2)
+
+ mh = A2ModHandler("@FINKPREFIX@/var/lib/apache2/modules")
+
+ name = os.path.split(sys.argv[0])[1]
+ if name == 'a2enmod':
+ mh.enable(sys.argv[1])
+ if name == 'a2dismod':
+ mh.disable(sys.argv[1])
+
+ try:
+ opts, args = getopt.getopt(sys.argv[1:],"hlv" ,["add","disable","enable","help","list","remove","version","force"])
+ except getopt.GetoptError:
+ usage()
+ sys.exit(2)
+
+ for o,a in opts:
+ if o in ("-h", "--help"):
+ usage()
+ sys.exit()
+ if o in ("-v", "--version"):
+ mh.version(versionnum)
+ sys.exit()
+ if o == "--add":
+ try:
+ mh.add(*args)
+ except ModuleAlreadyExists:
+ print "Module has already been registered"
+ sys.exit(1)
+ except (IndexError, TypeError):
+ usage()
+ sys.exit(2)
+ if o == "--remove":
+ try:
+ mh.remove(args[0])
+ except NoSuchModule:
+ print "No such module"
+ sys.exit(1)
+ except IndexError:
+ usage()
+ sys.exit(2)
+ if o == "--enable":
+ try:
+ mh.enable(args[0])
+ except NoSuchModule:
+ print "No Such Module"
+ sys.exit(1)
+ except IndexError:
+ usage()
+ sys.exit(2)
+ if o == "--disable":
+ try:
+ mh.disable(args[0])
+ except NoSuchModule:
+ print "No Such Module"
+ sys.exit(1)
+ except IndexError:
+ usage()
+ sys.exit(2)
+ if o in ("-l","--list"):
+ mh.dolist()
+
+def usage():
+ """Print the usage statement
+
+ Prints the correct list of arguments, and then exits.
+ """
+ print "Debian update-apache2-modules", versionnum
+ print "Copyright (C) 2002 Thom May, under the BSD license."
+ msg = """
+
+usage: update-apache2-modules --add
+ update-apache2-modules --remove
+ update-apache2-modules --enable
+ update-apache2-modules --disable
+ update-apache2-modules --list
+
+
+
+ The default if no sequence number is specified is 99
+
+"""
+ sys.stderr.write(msg)
+ return(0)
+
+
+if __name__ == '__main__':
+ main()
diff -ruN httpd-2.0.58.orig/fink/a2dismod.8 httpd-2.0.58/fink/a2dismod.8
--- httpd-2.0.58.orig/fink/a2dismod.8 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/a2dismod.8 2006-06-15 00:58:59.000000000 -0600
@@ -0,0 +1,34 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH A2DISMOD SECTION "October 4th, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+a2dismod \- disables an apache2 module
+.SH SYNOPSIS
+.B a2dismod [module]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B a2dismod
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB
+.\" \fI
+.\" respectively.
+\fBa2dismod\fP is a program that disables the specified apache2 module within
+the apache2 configuration.
+.SH AUTHOR
+This manual page was written by Daniel Stone
+GNU/Linux distribution, as it is a Debian-specific script with the package.
diff -ruN httpd-2.0.58.orig/fink/a2enmod.8 httpd-2.0.58/fink/a2enmod.8
--- httpd-2.0.58.orig/fink/a2enmod.8 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/a2enmod.8 2006-06-15 00:58:41.000000000 -0600
@@ -0,0 +1,34 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH A2ENMOD SECTION "October 4th, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+a2enmod \- enables an apache2 module
+.SH SYNOPSIS
+.B a2enmod [module]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B a2enmod
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB
+.\" \fI
+.\" respectively.
+\fBa2enmod\fP is a program that enables the specified apache2 module within
+the apache2 configuration.
+.SH AUTHOR
+This manual page was written by Daniel Stone
+GNU/Linux distribution, as it is a Debian-specific script with the package.
diff -ruN httpd-2.0.58.orig/fink/apache2-doc.conf httpd-2.0.58/fink/apache2-doc.conf
--- httpd-2.0.58.orig/fink/apache2-doc.conf 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/apache2-doc.conf 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,16 @@
+AliasMatch ^/apache2-default/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "@FINKPREFIX@/share/apache2/manual/$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "@FINKPREFIX@/share/apache2/manual/$1"
+
+ Options Indexes
+ AllowOverride None
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0.0/255.0.0.0 ::1/128
+
+
+ SetHandler type-map
+
+
+ SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1
+ RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
+
diff -ruN httpd-2.0.58.orig/fink/apache2.8 httpd-2.0.58/fink/apache2.8
--- httpd-2.0.58.orig/fink/apache2.8 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/apache2.8 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,179 @@
+.TH apache2 8 "February 1997"
+.\" The Apache Software License, Version 1.1
+.\"
+.\" Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+.\" reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in
+.\" the documentation and/or other materials provided with the
+.\" distribution.
+.\"
+.\" 3. The end-user documentation included with the redistribution,
+.\" if any, must include the following acknowledgment:
+.\" "This product includes software developed by the
+.\" Apache Software Foundation (http://www.apache.org/)."
+.\" Alternately, this acknowledgment may appear in the software itself,
+.\" if and wherever such third-party acknowledgments normally appear.
+.\"
+.\" 4. The names "Apache" and "Apache Software Foundation" must
+.\" not be used to endorse or promote products derived from this
+.\" software without prior written permission. For written
+.\" permission, please contact apache@apache.org.
+.\"
+.\" 5. Products derived from this software may not be called "Apache",
+.\" nor may "Apache" appear in their name, without prior written
+.\" permission of the Apache Software Foundation.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+.\" DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" This software consists of voluntary contributions made by many
+.\" individuals on behalf of the Apache Software Foundation. For more
+.\" information on the Apache Software Foundation, please see
+.\"
+.\"
+.SH NAME
+apache2 \- Apache hypertext transfer protocol server
+.SH SYNOPSIS
+.B apache2
+[
+.BI \-d " serverroot"
+] [
+.BI \-f " config"
+] [
+.BI \-C " directive"
+] [
+.BI \-c " directive"
+] [
+.BI \-D " parameter"
+]
+
+.B apache2
+[
+.B \-h
+]
+[
+.B \-l
+]
+[
+.B \-L
+]
+[
+.B \-v
+]
+[
+.B \-V
+]
+[
+.B \-t
+]
+[
+.B \-X
+]
+
+.SH DESCRIPTION
+.B apache2
+is the Apache HyperText Transfer Protocol (HTTP) server program. It is
+designed to be run as a standalone daemon process. When used like this
+it will create a pool of child processes to handle requests. To stop
+it, send a TERM signal to the initial (parent) process. The PID of
+this process is written to a file as given in the configuration file.
+.PP
+This manual page only lists the command line arguments. For details
+of the directives necessary to configure
+.B apache2
+see the Apache manual,
+which is part of the Apache distribution or can be found at
+http://httpd.apache.org/. Paths in this manual may not reflect those
+compiled into
+.B apache2.
+.SH OPTIONS
+.TP 12
+.BI \-d " serverroot"
+Set the initial value for the ServerRoot directive to \fIserverroot\fP. This
+can be overridden by the ServerRoot command in the configuration file. The
+default is \fB@FINKPREFIX@/etc/apache2\fP.
+.TP
+.BI \-f " config"
+Execute the commands in the file \fIconfig\fP on startup. If \fIconfig\fP
+does not begin with a /, then it is taken to be a path relative to
+the ServerRoot. The default is \fBconf/apache2.conf\fP.
+.TP
+.BI \-C " directive"
+Process the configuration \fIdirective\fP before reading config files.
+.TP
+.BI \-c " directive"
+Process the configuration \fIdirective\fP after reading config files.
+.TP
+.BI \-D " parameter"
+Sets a configuration \fIparameter\fP which can be used with
+
+to conditionally skip or process commands.
+.TP
+.B \-h
+Output a short summary of available command line options.
+.TP
+.B \-l
+Output a list of modules compiled into the server.
+.TP
+.B \-L
+Output a list of directives together with expected arguments and
+places where the directive is valid.
+.TP
+.B \-S
+Show the settings as parsed from the config file (currently only shows the
+virtualhost settings).
+.TP
+.B \-t
+Run syntax tests for configuration files only. The program immediately exits
+after these syntax parsing with either a return code of 0 (Syntax OK) or
+return code not equal to 0 (Syntax Error). If
+.BI \-D " DUMP_VHOSTS"
+is also set, details of the virtual host configuration will be printed.
+.TP
+.B \-v
+Print the version of
+.B apache2
+, and then exit.
+.TP
+.B \-V
+Print the version and build parameters of
+.B apache2
+, and then exit.
+.TP
+.B \-X
+Run
+.B apache2
+in debug mode. Only one worker will be started and the server will not detach
+from the console.
+.SH FILES
+.PD 0
+.B @FINKPREFIX@/etc/apache2/apache2.conf
+.br
+.B @FINKPREFIX@/etc/mime.types
+.br
+.B @FINKPREFIX@/etc/apache2/magic
+.br
+.B @FINKPREFIX@/var/log/apache2/error_log
+.br
+.B @FINKPREFIX@/var/log/apache2/access_log
+.br
+.B @FINKPREFIX@/var/run/apache2.pid
diff -ruN httpd-2.0.58.orig/fink/apache2ctl.8 httpd-2.0.58/fink/apache2ctl.8
--- httpd-2.0.58.orig/fink/apache2ctl.8 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/apache2ctl.8 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,135 @@
+.TH apache2ctl 8 "September 1997"
+.\" The Apache Software License, Version 1.1
+.\"
+.\" Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+.\" reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in
+.\" the documentation and/or other materials provided with the
+.\" distribution.
+.\"
+.\" 3. The end-user documentation included with the redistribution,
+.\" if any, must include the following acknowledgment:
+.\" "This product includes software developed by the
+.\" Apache Software Foundation (http://www.apache.org/)."
+.\" Alternately, this acknowledgment may appear in the software itself,
+.\" if and wherever such third-party acknowledgments normally appear.
+.\"
+.\" 4. The names "Apache" and "Apache Software Foundation" must
+.\" not be used to endorse or promote products derived from this
+.\" software without prior written permission. For written
+.\" permission, please contact apache@apache.org.
+.\"
+.\" 5. Products derived from this software may not be called "Apache",
+.\" nor may "Apache" appear in their name, without prior written
+.\" permission of the Apache Software Foundation.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+.\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+.\" DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" This software consists of voluntary contributions made by many
+.\" individuals on behalf of the Apache Software Foundation. For more
+.\" information on the Apache Software Foundation, please see
+.\"
+.\"
+.SH NAME
+apache2ctl \- Apache HTTP server control interface
+.SH SYNOPSIS
+.B apache2ctl
+\fIcommand\fP [...]
+.SH DESCRIPTION
+.B apache2ctl
+is a front end to the Apache HyperText Transfer Protocol (HTTP)
+server. It is designed to help the administrator control the
+functioning of the Apache
+.B apache2
+daemon.
+.PP
+.B NOTE:
+If your Apache installation uses non-standard paths, you will need to
+edit the
+.B apache2ctl
+script to set the appropriate paths to your PID file and your
+.B apache2
+binary. See the comments in the script for details.
+.PP
+The
+.B apache2ctl
+script returns a 0 exit value on success, and >0 if an error
+occurs. For more details, view the comments in the script.
+.PP
+Full documentation for Apache is available at
+.B http://httpd.apache.org/
+.
+.SH OPTIONS
+The \fIcommand\fP can be any one or more of the following options:
+.TP 12
+.BI start
+Start the Apache daemon. Gives an error if it is already running.
+.TP
+.BI stop
+Stops the Apache daemon.
+.TP
+.BI restart
+Restarts the Apache daemon by sending it a SIGHUP. If the daemon
+is not running, it is started.
+This command automatically checks the configuration files via
+.BI configtest
+before initiating the restart to make sure Apache doesn't die.
+.TP
+.BI fullstatus
+Displays a full status report from
+.B mod_status.
+For this to work, you need to have mod_status enabled on your server
+and a text-based browser such as \fIlynx\fP available on your system. The
+URL used to access the status report can be set by editing the
+.B STATUSURL
+variable in the script.
+.TP
+.BI status
+Displays a brief status report. Similar to the fullstatus option,
+except that the list of requests currently being served is omitted.
+.TP
+.BI graceful
+Gracefully restarts the Apache daemon by sending it a SIGUSR1. If
+the daemon is not running, it is started. This differs from a
+normal restart in that currently open connections are not aborted.
+A side effect is that old log files will not be closed immediately.
+This means that if used in a log rotation script, a substantial delay may be
+necessary to ensure that the old log files are closed before processing them.
+This command automatically checks the configuration files via
+.BI configtest
+before initiating the restart to make sure Apache doesn't die.
+On certain platforms that do not allow SIGUSR1 to be used for a graceful
+restart, an alternative signal may be used (such as SIGWINCH). graceful
+will send the right signal for your platform.
+.TP
+.BI configtest
+Run a configuration file syntax test. It parses the configuration
+files and either reports
+.B "Syntax Ok"
+or detailed information about the particular syntax error.
+.TP
+.BI help
+Displays a short help message.
+.SH SEE ALSO
+.BR apache2(8)
+.
diff -ruN httpd-2.0.58.orig/fink/check_forensic.8 httpd-2.0.58/fink/check_forensic.8
--- httpd-2.0.58.orig/fink/check_forensic.8 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/check_forensic.8 2006-06-15 00:57:59.000000000 -0600
@@ -0,0 +1,15 @@
+.TH check_forensic 8
+.SH NAME
+check_forensic \- tool to extract mod_log_forensic output from apache log files
+.SH SYNOPSIS
+.B check_forensic
+
+.SH "DESCRIPTION"
+chech_forensic is a simple shell script designed to help apache administrators
+to extract mod_log_forensic output from apache, apache-ssl and apache-perl
+log files.
+.PP
+.SH AUTHOR
+This manual page was written by Fabio M. Di Nitto
+
+(but may be used by others).
diff -ruN httpd-2.0.58.orig/fink/checkgid.8 httpd-2.0.58/fink/checkgid.8
--- httpd-2.0.58.orig/fink/checkgid.8 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/checkgid.8 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,36 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH CHECKGID 8 "November 3rd, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+checkgid \- checks the gid
+.SH SYNOPSIS
+.B checkgid group
+.SH DESCRIPTION
+This manual page documents briefly the
+.B checkgid
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB
+.\" \fI
+.\" respectively.
+\fBcheckgid\fP is a program that checks whether it can setgid to the group
+specified. This is to see if it is a valid group for apache2 to use at runtime.
+If the user (should be run as superuser) is in that group, or can setgid to it,
+it will return 0.
+.SH AUTHOR
+This manual page was written by Daniel Stone
+GNU/Linux distribution, as the original did not have a manpage.
diff -ruN httpd-2.0.58.orig/fink/config/apache2.conf httpd-2.0.58/fink/config/apache2.conf
--- httpd-2.0.58.orig/fink/config/apache2.conf 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/config/apache2.conf 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,393 @@
+# Based upon the NCSA server configuration files originally by Rob McCool.
+# Changed extensively for the Debian package by Daniel Stone
+# and also by Thom May
+
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE! If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the LockFile documentation
+# (available at
+# you will save yourself a lot of trouble.
+
+ServerRoot "@FINKPREFIX@/etc/apache2"
+
+# The LockFile directive sets the path to the lockfile used when Apache
+# is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
+# USE_FLOCK_SERIALIZED_ACCEPT. This directive should normally be left at
+# its default value. The main reason for changing it is if the logs
+# directory is NFS mounted, since the lockfile MUST BE STORED ON A LOCAL
+# DISK. The PID of the main server process is automatically appended to
+# the filename.
+
+LockFile @FINKPREFIX@/var/lock/apache2/accept.lock
+
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+
+PidFile @FINKPREFIX@/var/run/apache2/apache2.pid
+
+# Timeout: The number of seconds before receives and sends time out.
+
+Timeout 300
+
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+
+KeepAlive On
+
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+
+MaxKeepAliveRequests 100
+
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+
+KeepAliveTimeout 15
+
+##
+## Server-Pool Size Regulation (MPM specific)
+##
+
+# prefork MPM
+# StartServers ......... number of server processes to start
+# MinSpareServers ...... minimum number of server processes which are kept spare
+# MaxSpareServers ...... maximum number of server processes which are kept spare
+# MaxClients ........... maximum number of server processes allowed to start
+# MaxRequestsPerChild .. maximum number of requests a server process serves
+
+StartServers 5
+MinSpareServers 5
+MaxSpareServers 10
+MaxClients 20
+MaxRequestsPerChild 0
+
+
+# pthread MPM
+# StartServers ......... initial number of server processes to start
+# MaxClients ........... maximum number of server processes allowed to start
+# MinSpareThreads ...... minimum number of worker threads which are kept spare
+# MaxSpareThreads ...... maximum number of worker threads which are kept spare
+# ThreadsPerChild ...... constant number of worker threads in each server process
+# MaxRequestsPerChild .. maximum number of requests a server process serves
+
+StartServers 2
+MaxClients 150
+MinSpareThreads 25
+MaxSpareThreads 75
+ThreadsPerChild 25
+MaxRequestsPerChild 0
+
+
+# perchild MPM
+# NumServers ........... constant number of server processes
+# StartThreads ......... initial number of worker threads in each server process
+# MinSpareThreads ...... minimum number of worker threads which are kept spare
+# MaxSpareThreads ...... maximum number of worker threads which are kept spare
+# MaxThreadsPerChild ... maximum number of worker threads in each server process
+# MaxRequestsPerChild .. maximum number of connections per server process (then it dies)
+
+NumServers 5
+StartThreads 5
+MinSpareThreads 5
+MaxSpareThreads 10
+MaxThreadsPerChild 20
+MaxRequestsPerChild 0
+AcceptMutex fcntl
+
+
+User www
+Group www
+
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+
+# Global error log.
+ErrorLog @FINKPREFIX@/var/log/apache2/error.log
+
+# Include module configuration:
+Include @FINKPREFIX@/etc/apache2/mods-enabled/*.load
+Include @FINKPREFIX@/etc/apache2/mods-enabled/*.conf
+
+# Include all the user configurations:
+Include @FINKPREFIX@/etc/apache2/httpd.conf
+
+# Include ports listing
+Include @FINKPREFIX@/etc/apache2/ports.conf
+
+# Include generic snippets of statements
+Include @FINKPREFIX@/etc/apache2/conf.d/[^.#]*
+
+#Let's have some Icons, shall we?
+Alias /icons/ "@FINKPREFIX@/share/apache2/icons/"
+
+ Options Indexes MultiViews
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+
+
+# Set up the default error docs.
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# Putting this all together, we can Internationalize error responses.
+#
+# We use Alias to redirect any /error/HTTP_
+# our collection of by-error message multi-language collections. We use
+# includes to substitute the appropriate text.
+#
+# You can modify the messages' appearance without changing any of the
+# default HTTP_
+#
+# Alias /error/include/ "/your/include/path/"
+#
+# which allows you to create your own set of files by starting with the
+# /usr/local/apache2/error/include/ files and
+# copying them to /your/include/path/, even on a per-VirtualHost basis.
+#
+
+
+
+ Alias /error/ "@FINKPREFIX@/share/apache2/error/"
+
+
+ AllowOverride None
+ Options IncludesNoExec
+ AddOutputFilter Includes html
+ AddHandler type-map var
+ Order allow,deny
+ Allow from all
+ LanguagePriority en es de fr
+ ForceLanguagePriority Prefer Fallback
+
+
+ ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+ ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+ ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+ ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+ ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+ ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+ ErrorDocument 410 /error/HTTP_GONE.html.var
+ ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+ ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+ ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+ ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+ ErrorDocument 415 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+ ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+ ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+ ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+ ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+ ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+
+
+
+
+DirectoryIndex index.html index.cgi index.pl index.php index.xhtml
+
+# UserDir is now a module
+#UserDir Sites
+#UserDir disabled root
+
+#
+# AllowOverride FileInfo AuthConfig Limit
+# Options Indexes SymLinksIfOwnerMatch IncludesNoExec
+#
+
+AccessFileName .htaccess
+
+
+ Order allow,deny
+ Deny from all
+
+
+UseCanonicalName Off
+
+TypesConfig @FINKPREFIX@/etc/apache2/mime.types
+DefaultType text/plain
+
+HostnameLookups Off
+
+IndexOptions FancyIndexing VersionSort
+
+AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
+
+AddIconByType (TXT,/icons/text.gif) text/*
+AddIconByType (IMG,/icons/image2.gif) image/*
+AddIconByType (SND,/icons/sound2.gif) audio/*
+AddIconByType (VID,/icons/movie.gif) video/*
+
+# This really should be .jpg.
+
+AddIcon /icons/binary.gif .bin .exe
+AddIcon /icons/binhex.gif .hqx
+AddIcon /icons/tar.gif .tar
+AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /icons/a.gif .ps .ai .eps
+AddIcon /icons/layout.gif .html .shtml .htm .pdf
+AddIcon /icons/text.gif .txt
+AddIcon /icons/c.gif .c
+AddIcon /icons/p.gif .pl .py
+AddIcon /icons/f.gif .for
+AddIcon /icons/dvi.gif .dvi
+AddIcon /icons/uuencoded.gif .uu
+AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /icons/tex.gif .tex
+AddIcon /icons/bomb.gif core
+
+AddIcon /icons/back.gif ..
+AddIcon /icons/hand.right.gif README
+AddIcon /icons/folder.gif ^^DIRECTORY^^
+AddIcon /icons/blank.gif ^^BLANKICON^^
+
+
+# This is from Matty J's patch. Anyone want to make the icons?
+#AddIcon /icons/dirsymlink.jpg ^^SYMDIR^^
+#AddIcon /icons/symlink.jpg ^^SYMLINK^^
+
+DefaultIcon /icons/unknown.gif
+
+ReadmeName README.html
+HeaderName HEADER.html
+
+IndexIgnore .??* *~ *# HEADER* RCS CVS *,t
+
+AddEncoding x-compress Z
+AddEncoding x-gzip gz tgz
+
+AddLanguage da .dk
+AddLanguage nl .nl
+AddLanguage en .en
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage de .de
+AddLanguage el .el
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage pl .po
+AddLanguage ko .ko
+AddLanguage pt .pt
+AddLanguage no .no
+AddLanguage pt-br .pt-br
+AddLanguage ltz .ltz
+AddLanguage ca .ca
+AddLanguage es .es
+AddLanguage sv .se
+AddLanguage cz .cz
+AddLanguage ru .ru
+AddLanguage tw .tw
+AddLanguage zh-tw .tw
+
+LanguagePriority en da nl et fr de el it ja ko no pl pt pt-br ltz ca es sv tw
+
+
+#AddDefaultCharset ISO-8859-1
+
+AddCharset ISO-8859-1 .iso8859-1 .latin1
+AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen
+AddCharset ISO-8859-3 .iso8859-3 .latin3
+AddCharset ISO-8859-4 .iso8859-4 .latin4
+AddCharset ISO-8859-5 .iso8859-5 .latin5 .cyr .iso-ru
+AddCharset ISO-8859-6 .iso8859-6 .latin6 .arb
+AddCharset ISO-8859-7 .iso8859-7 .latin7 .grk
+AddCharset ISO-8859-8 .iso8859-8 .latin8 .heb
+AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk
+AddCharset ISO-2022-JP .iso2022-jp .jis
+AddCharset ISO-2022-KR .iso2022-kr .kis
+AddCharset ISO-2022-CN .iso2022-cn .cis
+AddCharset Big5 .Big5 .big5
+# For russian, more than one charset is used (depends on client, mostly):
+AddCharset WINDOWS-1251 .cp-1251 .win-1251
+AddCharset CP866 .cp866
+AddCharset KOI8-r .koi8-r .koi8-ru
+AddCharset KOI8-ru .koi8-uk .ua
+AddCharset ISO-10646-UCS-2 .ucs2
+AddCharset ISO-10646-UCS-4 .ucs4
+AddCharset UTF-8 .utf8
+
+AddCharset GB2312 .gb2312 .gb
+AddCharset utf-7 .utf7
+AddCharset utf-8 .utf8
+AddCharset big5 .big5 .b5
+AddCharset EUC-TW .euc-tw
+AddCharset EUC-JP .euc-jp
+AddCharset EUC-KR .euc-kr
+AddCharset shift_jis .sjis
+
+#AddType application/x-httpd-php .php
+#AddType application/x-httpd-php-source .phps
+
+AddType application/x-tar .tgz
+
+# To use CGI scripts outside /cgi-bin/:
+#
+#AddHandler cgi-script .cgi
+
+# To use server-parsed HTML files
+#
+
+ SetOutputFilter INCLUDES
+
+
+# If you wish to use server-parsed imagemap files, use
+#
+#AddHandler imap-file map
+
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+
+#
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash. This fixes a
+# problem with Microsoft WebFolders which does not appropriately handle
+# redirects for folders with DAV methods.
+#
+
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^gnome-vfs" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+
+# Allow server status reports, with the URL of http://servername/server-status
+# Change the ".your_domain.com" to match your domain to enable.
+#
+#
+# SetHandler server-status
+# Order deny,allow
+# Deny from all
+# Allow from .your_domain.com
+#
+
+# Allow remote server configuration reports, with the URL of
+# http://servername/server-info (requires that mod_info.c be loaded).
+# Change the ".your_domain.com" to match your domain to enable.
+#
+#
+# SetHandler server-info
+# Order deny,allow
+# Deny from all
+# Allow from .your_domain.com
+#
+
+# Include the virtual host configurations:
+Include @FINKPREFIX@/etc/apache2/sites-enabled/[^.#]*
diff -ruN httpd-2.0.58.orig/fink/config/httpd.conf httpd-2.0.58/fink/config/httpd.conf
--- httpd-2.0.58.orig/fink/config/httpd.conf 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/config/httpd.conf 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,5 @@
+# This is here for backwards compatability reasons and to support
+# installing 3rd party modules directly via apxs2, rather than
+# through the /etc/apache2/mods-{available,enabled} mechanism.
+#
+#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so
diff -ruN httpd-2.0.58.orig/fink/config/magic httpd-2.0.58/fink/config/magic
--- httpd-2.0.58.orig/fink/config/magic 1969-12-31 17:00:00.000000000 -0700
+++ httpd-2.0.58/fink/config/magic 2006-06-15 00:57:24.000000000 -0600
@@ -0,0 +1,371 @@
+# Magic data for mod_mime_magic Apache module (originally for file(1) command)
+# The module is described in htdocs/manual/mod/mod_mime_magic.html
+#
+# The format is 4-5 columns:
+# Column #1: byte number to begin checking from, ">" indicates continuation
+# Column #2: type of data to match
+# Column #3: contents of data to match
+# Column #4: MIME type of result
+# Column #5: MIME encoding of result (optional)
+
+#------------------------------------------------------------------------------
+# Localstuff: file(1) magic for locally observed files
+# Add any locally observed files here.
+
+#------------------------------------------------------------------------------
+# end local stuff
+#------------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# Java
+
+0 short 0xcafe
+>2 short 0xbabe application/java
+
+#------------------------------------------------------------------------------
+# audio: file(1) magic for sound formats
+#
+# from Jan Nicolai Langfeldt
+#
+
+# Sun/NeXT audio data
+0 string .snd
+>12 belong 1 audio/basic
+>12 belong 2 audio/basic
+>12 belong 3 audio/basic
+>12 belong 4 audio/basic
+>12 belong 5 audio/basic
+>12 belong 6 audio/basic
+>12 belong 7 audio/basic
+
+>12 belong 23 audio/x-adpcm
+
+# DEC systems (e.g. DECstation 5000) use a variant of the Sun/NeXT format
+# that uses little-endian encoding and has a different magic number
+# (0x0064732E in little-endian encoding).
+0 lelong 0x0064732E
+>12 lelong 1 audio/x-dec-basic
+>12 lelong 2 audio/x-dec-basic
+>12 lelong 3 audio/x-dec-basic
+>12 lelong 4 audio/x-dec-basic
+>12 lelong 5 audio/x-dec-basic
+>12 lelong 6 audio/x-dec-basic
+>12 lelong 7 audio/x-dec-basic
+# compressed (G.721 ADPCM)
+>12 lelong 23 audio/x-dec-adpcm
+
+# Bytes 0-3 of AIFF, AIFF-C, & 8SVX audio files are "FORM"
+# AIFF audio data
+8 string AIFF audio/x-aiff
+# AIFF-C audio data
+8 string AIFC audio/x-aiff
+# IFF/8SVX audio data
+8 string 8SVX audio/x-aiff
+
+# Creative Labs AUDIO stuff
+# Standard MIDI data
+0 string MThd audio/unknown
+#>9 byte >0 (format %d)
+#>11 byte >1 using %d channels
+# Creative Music (CMF) data
+0 string CTMF audio/unknown
+# SoundBlaster instrument data
+0 string SBI audio/unknown
+# Creative Labs voice data
+0 string Creative\ Voice\ File audio/unknown
+## is this next line right? it came this way...
+#>19 byte 0x1A
+#>23 byte >0 - version %d
+#>22 byte >0 \b.%d
+
+# [GRR 950115: is this also Creative Labs? Guessing that first line
+# should be string instead of unknown-endian long...]
+#0 long 0x4e54524b MultiTrack sound data
+#0 string NTRK MultiTrack sound data
+#>4 long x - version %ld
+
+# Microsoft WAVE format (*.wav)
+# [GRR 950115: probably all of the shorts and longs should be leshort/lelong]
+# Microsoft RIFF
+0 string RIFF audio/unknown
+# - WAVE format
+>8 string WAVE audio/x-wav
+
+#------------------------------------------------------------------------------
+# c-lang: file(1) magic for C programs or various scripts
+#
+
+# XPM icons (Greg Roelofs, newt@uchicago.edu)
+# ideally should go into "images", but entries below would tag XPM as C source
+0 string /*\ XPM image/x-xbm 7bit
+
+# this first will upset you if you're a PL/1 shop... (are there any left?)
+# in which case rm it; ascmagic will catch real C programs
+# C or REXX program text
+0 string /* text/plain
+# C++ program text
+0 string // text/plain
+
+#------------------------------------------------------------------------------
+# compress: file(1) magic for pure-compression formats (no archives)
+#
+# compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, whap, etc.
+#
+# Formats for various forms of compressed data
+# Formats for "compress" proper have been moved into "compress.c",
+# because it tries to uncompress it to figure out what's inside.
+
+# standard unix compress
+0 string \037\235 application/octet-stream x-compress
+
+# gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
+0 string \037\213 application/octet-stream x-gzip
+
+# According to gzip.h, this is the correct byte order for packed data.
+0 string \037\036 application/octet-stream
+#
+# This magic number is byte-order-independent.
+#
+0 short 017437 application/octet-stream
+
+# XXX - why *two* entries for "compacted data", one of which is
+# byte-order independent, and one of which is byte-order dependent?
+#
+# compacted data
+0 short 0x1fff application/octet-stream
+0 string \377\037 application/octet-stream
+# huf output
+0 short 0145405 application/octet-stream
+
+# Squeeze and Crunch...
+# These numbers were gleaned from the Unix versions of the programs to
+# handle these formats. Note that I can only uncrunch, not crunch, and
+# I didn't have a crunched file handy, so the crunch number is untested.
+# Keith Waclena
+#0 leshort 0x76FF squeezed data (CP/M, DOS)
+#0 leshort 0x76FE crunched data (CP/M, DOS)
+
+# Freeze
+#0 string \037\237 Frozen file 2.1
+#0 string \037\236 Frozen file 1.0 (or gzip 0.5)
+
+# lzh?
+#0 string \037\240 LZH compressed data
+
+#------------------------------------------------------------------------------
+# frame: file(1) magic for FrameMaker files
+#
+# This stuff came on a FrameMaker demo tape, most of which is
+# copyright, but this file is "published" as witness the following:
+#
+0 string \
+#------------------------------------------------------------------------------
+# html: file(1) magic for HTML (HyperText Markup Language) docs
+#
+# from Daniel Quinlan
+# and Anna Shergold
+#
+0 string \
+0 string \
+0 string \