mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Upgrade to 1.3b2, now with support files and docs installed
This commit is contained in:
Andrey A. Chernov
parent
969c718e89
commit
1d4dc4c536
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=8329
35 changed files with 1440 additions and 175 deletions
|
|
@ -1,13 +1,13 @@
|
||||||
# New ports collection makefile for: apache HTTPD
|
# New ports collection makefile for: apache HTTPD
|
||||||
# Version required: 1.3a1
|
# Version required: 1.3b2
|
||||||
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
||||||
# Whom: ache@nagual.pp.ru
|
# Whom: ache@nagual.pp.ru
|
||||||
#
|
#
|
||||||
# $Id: Makefile,v 1.38 1997/08/13 15:09:53 ache Exp $
|
# $Id: Makefile,v 1.39 1997/08/25 23:02:41 ache Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
DISTNAME= apache_1.3a1
|
DISTNAME= apache_1.3b2
|
||||||
PKGNAME= apache-1.3a1
|
PKGNAME= apache-1.3b2
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
||||||
|
|
||||||
|
|
@ -16,14 +16,60 @@ MAINTAINER= ache@freebsd.org
|
||||||
# Set it for local-supplied patch, f.e.
|
# Set it for local-supplied patch, f.e.
|
||||||
# VERS_ID = mods-1.0/me
|
# VERS_ID = mods-1.0/me
|
||||||
|
|
||||||
.if defined(VERS_ID)
|
|
||||||
post-patch:
|
post-patch:
|
||||||
|
@cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h
|
||||||
|
@cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
for I in access.conf-dist srm.conf-dist; do \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \
|
||||||
|
mv $${I}.new $${I}; \
|
||||||
|
done
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/etc/apache#g" < \
|
||||||
|
httpd.conf-dist > httpd.conf-dist.new && \
|
||||||
|
mv httpd.conf-dist.new httpd.conf-dist
|
||||||
|
@${RM} -rf ${WRKSRC}/icons/CVS
|
||||||
|
.if defined(VERS_ID)
|
||||||
@cd ${WRKSRC}/src && \
|
@cd ${WRKSRC}/src && \
|
||||||
mv Configuration Configuration.old && \
|
mv Configuration Configuration.old && \
|
||||||
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
||||||
< Configuration.old > Configuration
|
< Configuration.old > Configuration
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
CONF_DIR= ${PREFIX}/etc/apache
|
||||||
|
MAN1= htpasswd.1
|
||||||
|
MAN8= httpd.8
|
||||||
|
|
||||||
|
do-install:
|
||||||
|
install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/www/data \
|
||||||
|
${PREFIX}/www/icons ${PREFIX}/www/cgi-bin
|
||||||
|
${INSTALL_PROGRAM} ${WRKSRC}/src/httpd ${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_PROGRAM} htdigest htpasswd logresolve rotatelogs \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_SCRIPT} apachectl dbmmanage log_server_status \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
${INSTALL_DATA} -o nobody ${WRKSRC}/icons/* ${PREFIX}/www/icons
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
|
||||||
|
${PREFIX}/man/man8
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
|
||||||
|
${PREFIX}/man/man1
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in httpd.conf srm.conf access.conf ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR}/$$file ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR} ; \
|
||||||
|
done
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in mime.types magic ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR} ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR}/$${file}-dist ; \
|
||||||
|
done
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
||||||
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
MD5 (apache_1.3a1.tar.gz) = 638fad5c69178d2a92407900547e8732
|
MD5 (apache_1.3b2.tar.gz) = f9cb0c120e15989b670bd8e1c0b3b7c1
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,51 @@
|
||||||
*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
|
*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997
|
||||||
--- conf/access.conf-dist Fri Jul 5 06:32:54 1996
|
--- src/main/fnmatch.h Wed Oct 22 22:44:12 1997
|
||||||
***************
|
***************
|
||||||
*** 12,18 ****
|
*** 35,40 ****
|
||||||
|
--- 35,44 ----
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
/* This file has been modified by the Apache Group. */
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/htdocs>
|
+ #ifdef __FreeBSD__
|
||||||
|
+ #include "freebsd_fnmatch.h"
|
||||||
|
+ extern int is_fnmatch(const char *);
|
||||||
|
+ #else
|
||||||
|
#ifndef _FNMATCH_H_
|
||||||
|
#define _FNMATCH_H_
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
--- 12,18 ----
|
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
|
||||||
|
|
||||||
! <Directory /usr/local/www/data>
|
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
***************
|
***************
|
||||||
*** 38,44 ****
|
*** 50,52 ****
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
--- 54,57 ----
|
||||||
# CGI directory exists, if you have that configured.
|
extern int is_fnmatch(const char *);
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/cgi-bin>
|
#endif /* !_FNMATCH_H_ */
|
||||||
AllowOverride None
|
+ #endif /* !FreeBSD */
|
||||||
Options None
|
*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997
|
||||||
</Directory>
|
--- src/main/fnmatch.c Wed Oct 22 22:40:52 1997
|
||||||
--- 38,44 ----
|
***************
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
*** 34,39 ****
|
||||||
# CGI directory exists, if you have that configured.
|
--- 34,40 ----
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
! <Directory /usr/local/www/cgi-bin>
|
+ #ifndef __FreeBSD__
|
||||||
AllowOverride None
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
Options None
|
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
|
||||||
</Directory>
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
***************
|
||||||
|
*** 169,175 ****
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
!
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
--- 170,176 ----
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
! #endif /* !FreeBSD */
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
|
|
||||||
89
www/apache13/files/patch-ag
Normal file
89
www/apache13/files/patch-ag
Normal file
|
|
@ -0,0 +1,89 @@
|
||||||
|
*** conf/httpd.conf-dist.orig Thu Oct 16 22:55:54 1997
|
||||||
|
--- conf/httpd.conf-dist Wed Oct 22 20:58:36 1997
|
||||||
|
***************
|
||||||
|
*** 34,40 ****
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group #-1
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
--- 34,40 ----
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group nogroup
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
***************
|
||||||
|
*** 56,76 ****
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog logs/error_log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog logs/access_log
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile logs/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile logs/apache_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
--- 56,78 ----
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog /var/log/httpd-error.log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog /var/log/httpd-access.log
|
||||||
|
!
|
||||||
|
! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile /var/run/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile /var/run/apache_runtime_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
***************
|
||||||
|
*** 175,184 ****
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /www/docs/host.some_domain.com
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog logs/host.some_domain.com-error_log
|
||||||
|
! #TransferLog logs/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
|
--- 177,186 ----
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /usr/local/www/host.some_domain.com/data
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog /var/log/host.some_domain.com-error_log
|
||||||
|
! #TransferLog /var/log/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
50
www/apache13/files/patch-ak
Normal file
50
www/apache13/files/patch-ak
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
*** src/support/apachectl.orig Thu Oct 16 22:58:26 1997
|
||||||
|
--- src/support/apachectl Thu Oct 23 03:35:09 1997
|
||||||
|
***************
|
||||||
|
*** 21,30 ****
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/etc/httpd/src/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
--- 21,30 ----
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/var/run/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/sbin/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
***************
|
||||||
|
*** 33,42 ****
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/server-status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
|
--- 33,44 ----
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
+
|
||||||
|
+ eval `limits -e -C daemon`
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
44
www/apache13/files/patch-al
Normal file
44
www/apache13/files/patch-al
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
*** src/support/log_server_status.bak Thu Oct 16 22:58:27 1997
|
||||||
|
--- src/support/log_server_status Thu Oct 23 00:13:07 1997
|
||||||
|
***************
|
||||||
|
*** 62,68 ****
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
--- 62,68 ----
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
***************
|
||||||
|
*** 88,98 ****
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
--- 88,98 ----
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`LC_TIME=C date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day.log");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
|
@ -6,6 +6,15 @@ etc/apache/access.conf-dist
|
||||||
etc/apache/mime.types-dist
|
etc/apache/mime.types-dist
|
||||||
etc/apache/magic-dist
|
etc/apache/magic-dist
|
||||||
sbin/httpd
|
sbin/httpd
|
||||||
|
sbin/apachectl
|
||||||
|
sbin/dbmmanage
|
||||||
|
sbin/htdigest
|
||||||
|
sbin/htpasswd
|
||||||
|
sbin/log_server_status
|
||||||
|
sbin/logresolve
|
||||||
|
sbin/rotatelogs
|
||||||
|
man/man1/htpasswd.1.gz
|
||||||
|
man/man8/httpd.8.gz
|
||||||
www/icons/README
|
www/icons/README
|
||||||
www/icons/a.gif
|
www/icons/a.gif
|
||||||
www/icons/alert.black.gif
|
www/icons/alert.black.gif
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
# New ports collection makefile for: apache HTTPD
|
# New ports collection makefile for: apache HTTPD
|
||||||
# Version required: 1.3a1
|
# Version required: 1.3b2
|
||||||
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
||||||
# Whom: ache@nagual.pp.ru
|
# Whom: ache@nagual.pp.ru
|
||||||
#
|
#
|
||||||
# $Id: Makefile,v 1.38 1997/08/13 15:09:53 ache Exp $
|
# $Id: Makefile,v 1.39 1997/08/25 23:02:41 ache Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
DISTNAME= apache_1.3a1
|
DISTNAME= apache_1.3b2
|
||||||
PKGNAME= apache-1.3a1
|
PKGNAME= apache-1.3b2
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
||||||
|
|
||||||
|
|
@ -16,14 +16,60 @@ MAINTAINER= ache@freebsd.org
|
||||||
# Set it for local-supplied patch, f.e.
|
# Set it for local-supplied patch, f.e.
|
||||||
# VERS_ID = mods-1.0/me
|
# VERS_ID = mods-1.0/me
|
||||||
|
|
||||||
.if defined(VERS_ID)
|
|
||||||
post-patch:
|
post-patch:
|
||||||
|
@cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h
|
||||||
|
@cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
for I in access.conf-dist srm.conf-dist; do \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \
|
||||||
|
mv $${I}.new $${I}; \
|
||||||
|
done
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/etc/apache#g" < \
|
||||||
|
httpd.conf-dist > httpd.conf-dist.new && \
|
||||||
|
mv httpd.conf-dist.new httpd.conf-dist
|
||||||
|
@${RM} -rf ${WRKSRC}/icons/CVS
|
||||||
|
.if defined(VERS_ID)
|
||||||
@cd ${WRKSRC}/src && \
|
@cd ${WRKSRC}/src && \
|
||||||
mv Configuration Configuration.old && \
|
mv Configuration Configuration.old && \
|
||||||
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
||||||
< Configuration.old > Configuration
|
< Configuration.old > Configuration
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
CONF_DIR= ${PREFIX}/etc/apache
|
||||||
|
MAN1= htpasswd.1
|
||||||
|
MAN8= httpd.8
|
||||||
|
|
||||||
|
do-install:
|
||||||
|
install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/www/data \
|
||||||
|
${PREFIX}/www/icons ${PREFIX}/www/cgi-bin
|
||||||
|
${INSTALL_PROGRAM} ${WRKSRC}/src/httpd ${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_PROGRAM} htdigest htpasswd logresolve rotatelogs \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_SCRIPT} apachectl dbmmanage log_server_status \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
${INSTALL_DATA} -o nobody ${WRKSRC}/icons/* ${PREFIX}/www/icons
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
|
||||||
|
${PREFIX}/man/man8
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
|
||||||
|
${PREFIX}/man/man1
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in httpd.conf srm.conf access.conf ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR}/$$file ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR} ; \
|
||||||
|
done
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in mime.types magic ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR} ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR}/$${file}-dist ; \
|
||||||
|
done
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
||||||
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
MD5 (apache_1.3a1.tar.gz) = 638fad5c69178d2a92407900547e8732
|
MD5 (apache_1.3b2.tar.gz) = f9cb0c120e15989b670bd8e1c0b3b7c1
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,51 @@
|
||||||
*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
|
*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997
|
||||||
--- conf/access.conf-dist Fri Jul 5 06:32:54 1996
|
--- src/main/fnmatch.h Wed Oct 22 22:44:12 1997
|
||||||
***************
|
***************
|
||||||
*** 12,18 ****
|
*** 35,40 ****
|
||||||
|
--- 35,44 ----
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
/* This file has been modified by the Apache Group. */
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/htdocs>
|
+ #ifdef __FreeBSD__
|
||||||
|
+ #include "freebsd_fnmatch.h"
|
||||||
|
+ extern int is_fnmatch(const char *);
|
||||||
|
+ #else
|
||||||
|
#ifndef _FNMATCH_H_
|
||||||
|
#define _FNMATCH_H_
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
--- 12,18 ----
|
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
|
||||||
|
|
||||||
! <Directory /usr/local/www/data>
|
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
***************
|
***************
|
||||||
*** 38,44 ****
|
*** 50,52 ****
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
--- 54,57 ----
|
||||||
# CGI directory exists, if you have that configured.
|
extern int is_fnmatch(const char *);
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/cgi-bin>
|
#endif /* !_FNMATCH_H_ */
|
||||||
AllowOverride None
|
+ #endif /* !FreeBSD */
|
||||||
Options None
|
*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997
|
||||||
</Directory>
|
--- src/main/fnmatch.c Wed Oct 22 22:40:52 1997
|
||||||
--- 38,44 ----
|
***************
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
*** 34,39 ****
|
||||||
# CGI directory exists, if you have that configured.
|
--- 34,40 ----
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
! <Directory /usr/local/www/cgi-bin>
|
+ #ifndef __FreeBSD__
|
||||||
AllowOverride None
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
Options None
|
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
|
||||||
</Directory>
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
***************
|
||||||
|
*** 169,175 ****
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
!
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
--- 170,176 ----
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
! #endif /* !FreeBSD */
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
|
|
||||||
89
www/apache2/files/patch-ag
Normal file
89
www/apache2/files/patch-ag
Normal file
|
|
@ -0,0 +1,89 @@
|
||||||
|
*** conf/httpd.conf-dist.orig Thu Oct 16 22:55:54 1997
|
||||||
|
--- conf/httpd.conf-dist Wed Oct 22 20:58:36 1997
|
||||||
|
***************
|
||||||
|
*** 34,40 ****
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group #-1
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
--- 34,40 ----
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group nogroup
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
***************
|
||||||
|
*** 56,76 ****
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog logs/error_log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog logs/access_log
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile logs/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile logs/apache_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
--- 56,78 ----
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog /var/log/httpd-error.log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog /var/log/httpd-access.log
|
||||||
|
!
|
||||||
|
! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile /var/run/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile /var/run/apache_runtime_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
***************
|
||||||
|
*** 175,184 ****
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /www/docs/host.some_domain.com
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog logs/host.some_domain.com-error_log
|
||||||
|
! #TransferLog logs/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
|
--- 177,186 ----
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /usr/local/www/host.some_domain.com/data
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog /var/log/host.some_domain.com-error_log
|
||||||
|
! #TransferLog /var/log/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
50
www/apache2/files/patch-ak
Normal file
50
www/apache2/files/patch-ak
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
*** src/support/apachectl.orig Thu Oct 16 22:58:26 1997
|
||||||
|
--- src/support/apachectl Thu Oct 23 03:35:09 1997
|
||||||
|
***************
|
||||||
|
*** 21,30 ****
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/etc/httpd/src/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
--- 21,30 ----
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/var/run/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/sbin/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
***************
|
||||||
|
*** 33,42 ****
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/server-status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
|
--- 33,44 ----
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
+
|
||||||
|
+ eval `limits -e -C daemon`
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
44
www/apache2/files/patch-al
Normal file
44
www/apache2/files/patch-al
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
*** src/support/log_server_status.bak Thu Oct 16 22:58:27 1997
|
||||||
|
--- src/support/log_server_status Thu Oct 23 00:13:07 1997
|
||||||
|
***************
|
||||||
|
*** 62,68 ****
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
--- 62,68 ----
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
***************
|
||||||
|
*** 88,98 ****
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
--- 88,98 ----
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`LC_TIME=C date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day.log");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
|
@ -6,6 +6,15 @@ etc/apache/access.conf-dist
|
||||||
etc/apache/mime.types-dist
|
etc/apache/mime.types-dist
|
||||||
etc/apache/magic-dist
|
etc/apache/magic-dist
|
||||||
sbin/httpd
|
sbin/httpd
|
||||||
|
sbin/apachectl
|
||||||
|
sbin/dbmmanage
|
||||||
|
sbin/htdigest
|
||||||
|
sbin/htpasswd
|
||||||
|
sbin/log_server_status
|
||||||
|
sbin/logresolve
|
||||||
|
sbin/rotatelogs
|
||||||
|
man/man1/htpasswd.1.gz
|
||||||
|
man/man8/httpd.8.gz
|
||||||
www/icons/README
|
www/icons/README
|
||||||
www/icons/a.gif
|
www/icons/a.gif
|
||||||
www/icons/alert.black.gif
|
www/icons/alert.black.gif
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
# New ports collection makefile for: apache HTTPD
|
# New ports collection makefile for: apache HTTPD
|
||||||
# Version required: 1.3a1
|
# Version required: 1.3b2
|
||||||
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
||||||
# Whom: ache@nagual.pp.ru
|
# Whom: ache@nagual.pp.ru
|
||||||
#
|
#
|
||||||
# $Id: Makefile,v 1.38 1997/08/13 15:09:53 ache Exp $
|
# $Id: Makefile,v 1.39 1997/08/25 23:02:41 ache Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
DISTNAME= apache_1.3a1
|
DISTNAME= apache_1.3b2
|
||||||
PKGNAME= apache-1.3a1
|
PKGNAME= apache-1.3b2
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
||||||
|
|
||||||
|
|
@ -16,14 +16,60 @@ MAINTAINER= ache@freebsd.org
|
||||||
# Set it for local-supplied patch, f.e.
|
# Set it for local-supplied patch, f.e.
|
||||||
# VERS_ID = mods-1.0/me
|
# VERS_ID = mods-1.0/me
|
||||||
|
|
||||||
.if defined(VERS_ID)
|
|
||||||
post-patch:
|
post-patch:
|
||||||
|
@cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h
|
||||||
|
@cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
for I in access.conf-dist srm.conf-dist; do \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \
|
||||||
|
mv $${I}.new $${I}; \
|
||||||
|
done
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/etc/apache#g" < \
|
||||||
|
httpd.conf-dist > httpd.conf-dist.new && \
|
||||||
|
mv httpd.conf-dist.new httpd.conf-dist
|
||||||
|
@${RM} -rf ${WRKSRC}/icons/CVS
|
||||||
|
.if defined(VERS_ID)
|
||||||
@cd ${WRKSRC}/src && \
|
@cd ${WRKSRC}/src && \
|
||||||
mv Configuration Configuration.old && \
|
mv Configuration Configuration.old && \
|
||||||
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
||||||
< Configuration.old > Configuration
|
< Configuration.old > Configuration
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
CONF_DIR= ${PREFIX}/etc/apache
|
||||||
|
MAN1= htpasswd.1
|
||||||
|
MAN8= httpd.8
|
||||||
|
|
||||||
|
do-install:
|
||||||
|
install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/www/data \
|
||||||
|
${PREFIX}/www/icons ${PREFIX}/www/cgi-bin
|
||||||
|
${INSTALL_PROGRAM} ${WRKSRC}/src/httpd ${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_PROGRAM} htdigest htpasswd logresolve rotatelogs \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_SCRIPT} apachectl dbmmanage log_server_status \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
${INSTALL_DATA} -o nobody ${WRKSRC}/icons/* ${PREFIX}/www/icons
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
|
||||||
|
${PREFIX}/man/man8
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
|
||||||
|
${PREFIX}/man/man1
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in httpd.conf srm.conf access.conf ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR}/$$file ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR} ; \
|
||||||
|
done
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in mime.types magic ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR} ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR}/$${file}-dist ; \
|
||||||
|
done
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
||||||
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
MD5 (apache_1.3a1.tar.gz) = 638fad5c69178d2a92407900547e8732
|
MD5 (apache_1.3b2.tar.gz) = f9cb0c120e15989b670bd8e1c0b3b7c1
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,51 @@
|
||||||
*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
|
*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997
|
||||||
--- conf/access.conf-dist Fri Jul 5 06:32:54 1996
|
--- src/main/fnmatch.h Wed Oct 22 22:44:12 1997
|
||||||
***************
|
***************
|
||||||
*** 12,18 ****
|
*** 35,40 ****
|
||||||
|
--- 35,44 ----
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
/* This file has been modified by the Apache Group. */
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/htdocs>
|
+ #ifdef __FreeBSD__
|
||||||
|
+ #include "freebsd_fnmatch.h"
|
||||||
|
+ extern int is_fnmatch(const char *);
|
||||||
|
+ #else
|
||||||
|
#ifndef _FNMATCH_H_
|
||||||
|
#define _FNMATCH_H_
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
--- 12,18 ----
|
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
|
||||||
|
|
||||||
! <Directory /usr/local/www/data>
|
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
***************
|
***************
|
||||||
*** 38,44 ****
|
*** 50,52 ****
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
--- 54,57 ----
|
||||||
# CGI directory exists, if you have that configured.
|
extern int is_fnmatch(const char *);
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/cgi-bin>
|
#endif /* !_FNMATCH_H_ */
|
||||||
AllowOverride None
|
+ #endif /* !FreeBSD */
|
||||||
Options None
|
*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997
|
||||||
</Directory>
|
--- src/main/fnmatch.c Wed Oct 22 22:40:52 1997
|
||||||
--- 38,44 ----
|
***************
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
*** 34,39 ****
|
||||||
# CGI directory exists, if you have that configured.
|
--- 34,40 ----
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
! <Directory /usr/local/www/cgi-bin>
|
+ #ifndef __FreeBSD__
|
||||||
AllowOverride None
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
Options None
|
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
|
||||||
</Directory>
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
***************
|
||||||
|
*** 169,175 ****
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
!
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
--- 170,176 ----
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
! #endif /* !FreeBSD */
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
|
|
||||||
89
www/apache20/files/patch-ag
Normal file
89
www/apache20/files/patch-ag
Normal file
|
|
@ -0,0 +1,89 @@
|
||||||
|
*** conf/httpd.conf-dist.orig Thu Oct 16 22:55:54 1997
|
||||||
|
--- conf/httpd.conf-dist Wed Oct 22 20:58:36 1997
|
||||||
|
***************
|
||||||
|
*** 34,40 ****
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group #-1
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
--- 34,40 ----
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group nogroup
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
***************
|
||||||
|
*** 56,76 ****
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog logs/error_log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog logs/access_log
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile logs/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile logs/apache_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
--- 56,78 ----
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog /var/log/httpd-error.log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog /var/log/httpd-access.log
|
||||||
|
!
|
||||||
|
! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile /var/run/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile /var/run/apache_runtime_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
***************
|
||||||
|
*** 175,184 ****
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /www/docs/host.some_domain.com
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog logs/host.some_domain.com-error_log
|
||||||
|
! #TransferLog logs/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
|
--- 177,186 ----
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /usr/local/www/host.some_domain.com/data
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog /var/log/host.some_domain.com-error_log
|
||||||
|
! #TransferLog /var/log/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
50
www/apache20/files/patch-ak
Normal file
50
www/apache20/files/patch-ak
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
*** src/support/apachectl.orig Thu Oct 16 22:58:26 1997
|
||||||
|
--- src/support/apachectl Thu Oct 23 03:35:09 1997
|
||||||
|
***************
|
||||||
|
*** 21,30 ****
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/etc/httpd/src/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
--- 21,30 ----
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/var/run/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/sbin/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
***************
|
||||||
|
*** 33,42 ****
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/server-status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
|
--- 33,44 ----
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
+
|
||||||
|
+ eval `limits -e -C daemon`
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
44
www/apache20/files/patch-al
Normal file
44
www/apache20/files/patch-al
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
*** src/support/log_server_status.bak Thu Oct 16 22:58:27 1997
|
||||||
|
--- src/support/log_server_status Thu Oct 23 00:13:07 1997
|
||||||
|
***************
|
||||||
|
*** 62,68 ****
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
--- 62,68 ----
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
***************
|
||||||
|
*** 88,98 ****
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
--- 88,98 ----
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`LC_TIME=C date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day.log");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
|
@ -6,6 +6,15 @@ etc/apache/access.conf-dist
|
||||||
etc/apache/mime.types-dist
|
etc/apache/mime.types-dist
|
||||||
etc/apache/magic-dist
|
etc/apache/magic-dist
|
||||||
sbin/httpd
|
sbin/httpd
|
||||||
|
sbin/apachectl
|
||||||
|
sbin/dbmmanage
|
||||||
|
sbin/htdigest
|
||||||
|
sbin/htpasswd
|
||||||
|
sbin/log_server_status
|
||||||
|
sbin/logresolve
|
||||||
|
sbin/rotatelogs
|
||||||
|
man/man1/htpasswd.1.gz
|
||||||
|
man/man8/httpd.8.gz
|
||||||
www/icons/README
|
www/icons/README
|
||||||
www/icons/a.gif
|
www/icons/a.gif
|
||||||
www/icons/alert.black.gif
|
www/icons/alert.black.gif
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
# New ports collection makefile for: apache HTTPD
|
# New ports collection makefile for: apache HTTPD
|
||||||
# Version required: 1.3a1
|
# Version required: 1.3b2
|
||||||
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
||||||
# Whom: ache@nagual.pp.ru
|
# Whom: ache@nagual.pp.ru
|
||||||
#
|
#
|
||||||
# $Id: Makefile,v 1.38 1997/08/13 15:09:53 ache Exp $
|
# $Id: Makefile,v 1.39 1997/08/25 23:02:41 ache Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
DISTNAME= apache_1.3a1
|
DISTNAME= apache_1.3b2
|
||||||
PKGNAME= apache-1.3a1
|
PKGNAME= apache-1.3b2
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
||||||
|
|
||||||
|
|
@ -16,14 +16,60 @@ MAINTAINER= ache@freebsd.org
|
||||||
# Set it for local-supplied patch, f.e.
|
# Set it for local-supplied patch, f.e.
|
||||||
# VERS_ID = mods-1.0/me
|
# VERS_ID = mods-1.0/me
|
||||||
|
|
||||||
.if defined(VERS_ID)
|
|
||||||
post-patch:
|
post-patch:
|
||||||
|
@cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h
|
||||||
|
@cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
for I in access.conf-dist srm.conf-dist; do \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \
|
||||||
|
mv $${I}.new $${I}; \
|
||||||
|
done
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/etc/apache#g" < \
|
||||||
|
httpd.conf-dist > httpd.conf-dist.new && \
|
||||||
|
mv httpd.conf-dist.new httpd.conf-dist
|
||||||
|
@${RM} -rf ${WRKSRC}/icons/CVS
|
||||||
|
.if defined(VERS_ID)
|
||||||
@cd ${WRKSRC}/src && \
|
@cd ${WRKSRC}/src && \
|
||||||
mv Configuration Configuration.old && \
|
mv Configuration Configuration.old && \
|
||||||
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
||||||
< Configuration.old > Configuration
|
< Configuration.old > Configuration
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
CONF_DIR= ${PREFIX}/etc/apache
|
||||||
|
MAN1= htpasswd.1
|
||||||
|
MAN8= httpd.8
|
||||||
|
|
||||||
|
do-install:
|
||||||
|
install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/www/data \
|
||||||
|
${PREFIX}/www/icons ${PREFIX}/www/cgi-bin
|
||||||
|
${INSTALL_PROGRAM} ${WRKSRC}/src/httpd ${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_PROGRAM} htdigest htpasswd logresolve rotatelogs \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_SCRIPT} apachectl dbmmanage log_server_status \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
${INSTALL_DATA} -o nobody ${WRKSRC}/icons/* ${PREFIX}/www/icons
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
|
||||||
|
${PREFIX}/man/man8
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
|
||||||
|
${PREFIX}/man/man1
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in httpd.conf srm.conf access.conf ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR}/$$file ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR} ; \
|
||||||
|
done
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in mime.types magic ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR} ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR}/$${file}-dist ; \
|
||||||
|
done
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
||||||
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
MD5 (apache_1.3a1.tar.gz) = 638fad5c69178d2a92407900547e8732
|
MD5 (apache_1.3b2.tar.gz) = f9cb0c120e15989b670bd8e1c0b3b7c1
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,51 @@
|
||||||
*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
|
*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997
|
||||||
--- conf/access.conf-dist Fri Jul 5 06:32:54 1996
|
--- src/main/fnmatch.h Wed Oct 22 22:44:12 1997
|
||||||
***************
|
***************
|
||||||
*** 12,18 ****
|
*** 35,40 ****
|
||||||
|
--- 35,44 ----
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
/* This file has been modified by the Apache Group. */
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/htdocs>
|
+ #ifdef __FreeBSD__
|
||||||
|
+ #include "freebsd_fnmatch.h"
|
||||||
|
+ extern int is_fnmatch(const char *);
|
||||||
|
+ #else
|
||||||
|
#ifndef _FNMATCH_H_
|
||||||
|
#define _FNMATCH_H_
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
--- 12,18 ----
|
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
|
||||||
|
|
||||||
! <Directory /usr/local/www/data>
|
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
***************
|
***************
|
||||||
*** 38,44 ****
|
*** 50,52 ****
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
--- 54,57 ----
|
||||||
# CGI directory exists, if you have that configured.
|
extern int is_fnmatch(const char *);
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/cgi-bin>
|
#endif /* !_FNMATCH_H_ */
|
||||||
AllowOverride None
|
+ #endif /* !FreeBSD */
|
||||||
Options None
|
*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997
|
||||||
</Directory>
|
--- src/main/fnmatch.c Wed Oct 22 22:40:52 1997
|
||||||
--- 38,44 ----
|
***************
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
*** 34,39 ****
|
||||||
# CGI directory exists, if you have that configured.
|
--- 34,40 ----
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
! <Directory /usr/local/www/cgi-bin>
|
+ #ifndef __FreeBSD__
|
||||||
AllowOverride None
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
Options None
|
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
|
||||||
</Directory>
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
***************
|
||||||
|
*** 169,175 ****
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
!
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
--- 170,176 ----
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
! #endif /* !FreeBSD */
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
|
|
||||||
89
www/apache21/files/patch-ag
Normal file
89
www/apache21/files/patch-ag
Normal file
|
|
@ -0,0 +1,89 @@
|
||||||
|
*** conf/httpd.conf-dist.orig Thu Oct 16 22:55:54 1997
|
||||||
|
--- conf/httpd.conf-dist Wed Oct 22 20:58:36 1997
|
||||||
|
***************
|
||||||
|
*** 34,40 ****
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group #-1
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
--- 34,40 ----
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group nogroup
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
***************
|
||||||
|
*** 56,76 ****
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog logs/error_log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog logs/access_log
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile logs/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile logs/apache_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
--- 56,78 ----
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog /var/log/httpd-error.log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog /var/log/httpd-access.log
|
||||||
|
!
|
||||||
|
! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile /var/run/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile /var/run/apache_runtime_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
***************
|
||||||
|
*** 175,184 ****
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /www/docs/host.some_domain.com
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog logs/host.some_domain.com-error_log
|
||||||
|
! #TransferLog logs/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
|
--- 177,186 ----
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /usr/local/www/host.some_domain.com/data
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog /var/log/host.some_domain.com-error_log
|
||||||
|
! #TransferLog /var/log/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
50
www/apache21/files/patch-ak
Normal file
50
www/apache21/files/patch-ak
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
*** src/support/apachectl.orig Thu Oct 16 22:58:26 1997
|
||||||
|
--- src/support/apachectl Thu Oct 23 03:35:09 1997
|
||||||
|
***************
|
||||||
|
*** 21,30 ****
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/etc/httpd/src/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
--- 21,30 ----
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/var/run/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/sbin/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
***************
|
||||||
|
*** 33,42 ****
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/server-status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
|
--- 33,44 ----
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
+
|
||||||
|
+ eval `limits -e -C daemon`
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
44
www/apache21/files/patch-al
Normal file
44
www/apache21/files/patch-al
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
*** src/support/log_server_status.bak Thu Oct 16 22:58:27 1997
|
||||||
|
--- src/support/log_server_status Thu Oct 23 00:13:07 1997
|
||||||
|
***************
|
||||||
|
*** 62,68 ****
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
--- 62,68 ----
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
***************
|
||||||
|
*** 88,98 ****
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
--- 88,98 ----
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`LC_TIME=C date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day.log");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
|
@ -6,6 +6,15 @@ etc/apache/access.conf-dist
|
||||||
etc/apache/mime.types-dist
|
etc/apache/mime.types-dist
|
||||||
etc/apache/magic-dist
|
etc/apache/magic-dist
|
||||||
sbin/httpd
|
sbin/httpd
|
||||||
|
sbin/apachectl
|
||||||
|
sbin/dbmmanage
|
||||||
|
sbin/htdigest
|
||||||
|
sbin/htpasswd
|
||||||
|
sbin/log_server_status
|
||||||
|
sbin/logresolve
|
||||||
|
sbin/rotatelogs
|
||||||
|
man/man1/htpasswd.1.gz
|
||||||
|
man/man8/httpd.8.gz
|
||||||
www/icons/README
|
www/icons/README
|
||||||
www/icons/a.gif
|
www/icons/a.gif
|
||||||
www/icons/alert.black.gif
|
www/icons/alert.black.gif
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
# New ports collection makefile for: apache HTTPD
|
# New ports collection makefile for: apache HTTPD
|
||||||
# Version required: 1.3a1
|
# Version required: 1.3b2
|
||||||
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
# Date created: Fri Aug 25 16:42:36 CDT 1995
|
||||||
# Whom: ache@nagual.pp.ru
|
# Whom: ache@nagual.pp.ru
|
||||||
#
|
#
|
||||||
# $Id: Makefile,v 1.38 1997/08/13 15:09:53 ache Exp $
|
# $Id: Makefile,v 1.39 1997/08/25 23:02:41 ache Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
DISTNAME= apache_1.3a1
|
DISTNAME= apache_1.3b2
|
||||||
PKGNAME= apache-1.3a1
|
PKGNAME= apache-1.3b2
|
||||||
CATEGORIES= www
|
CATEGORIES= www
|
||||||
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
||||||
|
|
||||||
|
|
@ -16,14 +16,60 @@ MAINTAINER= ache@freebsd.org
|
||||||
# Set it for local-supplied patch, f.e.
|
# Set it for local-supplied patch, f.e.
|
||||||
# VERS_ID = mods-1.0/me
|
# VERS_ID = mods-1.0/me
|
||||||
|
|
||||||
.if defined(VERS_ID)
|
|
||||||
post-patch:
|
post-patch:
|
||||||
|
@cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h
|
||||||
|
@cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
for I in access.conf-dist srm.conf-dist; do \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \
|
||||||
|
mv $${I}.new $${I}; \
|
||||||
|
done
|
||||||
|
@cd ${WRKSRC}/conf && \
|
||||||
|
sed -e "s#@@ServerRoot@@#${PREFIX}/etc/apache#g" < \
|
||||||
|
httpd.conf-dist > httpd.conf-dist.new && \
|
||||||
|
mv httpd.conf-dist.new httpd.conf-dist
|
||||||
|
@${RM} -rf ${WRKSRC}/icons/CVS
|
||||||
|
.if defined(VERS_ID)
|
||||||
@cd ${WRKSRC}/src && \
|
@cd ${WRKSRC}/src && \
|
||||||
mv Configuration Configuration.old && \
|
mv Configuration Configuration.old && \
|
||||||
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
||||||
< Configuration.old > Configuration
|
< Configuration.old > Configuration
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
CONF_DIR= ${PREFIX}/etc/apache
|
||||||
|
MAN1= htpasswd.1
|
||||||
|
MAN8= httpd.8
|
||||||
|
|
||||||
|
do-install:
|
||||||
|
install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/www/data \
|
||||||
|
${PREFIX}/www/icons ${PREFIX}/www/cgi-bin
|
||||||
|
${INSTALL_PROGRAM} ${WRKSRC}/src/httpd ${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_PROGRAM} htdigest htpasswd logresolve rotatelogs \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
cd ${WRKSRC}/src/support && \
|
||||||
|
${INSTALL_SCRIPT} apachectl dbmmanage log_server_status \
|
||||||
|
${PREFIX}/sbin
|
||||||
|
${INSTALL_DATA} -o nobody ${WRKSRC}/icons/* ${PREFIX}/www/icons
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
|
||||||
|
${PREFIX}/man/man8
|
||||||
|
${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
|
||||||
|
${PREFIX}/man/man1
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in httpd.conf srm.conf access.conf ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR}/$$file ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file-dist ${CONF_DIR} ; \
|
||||||
|
done
|
||||||
|
cd ${WRKSRC} && \
|
||||||
|
for file in mime.types magic ; do \
|
||||||
|
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR} ; \
|
||||||
|
fi ; \
|
||||||
|
${INSTALL_DATA} conf/$$file ${CONF_DIR}/$${file}-dist ; \
|
||||||
|
done
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
||||||
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
MD5 (apache_1.3a1.tar.gz) = 638fad5c69178d2a92407900547e8732
|
MD5 (apache_1.3b2.tar.gz) = f9cb0c120e15989b670bd8e1c0b3b7c1
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,51 @@
|
||||||
*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
|
*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997
|
||||||
--- conf/access.conf-dist Fri Jul 5 06:32:54 1996
|
--- src/main/fnmatch.h Wed Oct 22 22:44:12 1997
|
||||||
***************
|
***************
|
||||||
*** 12,18 ****
|
*** 35,40 ****
|
||||||
|
--- 35,44 ----
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
/* This file has been modified by the Apache Group. */
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/htdocs>
|
+ #ifdef __FreeBSD__
|
||||||
|
+ #include "freebsd_fnmatch.h"
|
||||||
|
+ extern int is_fnmatch(const char *);
|
||||||
|
+ #else
|
||||||
|
#ifndef _FNMATCH_H_
|
||||||
|
#define _FNMATCH_H_
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
--- 12,18 ----
|
|
||||||
|
|
||||||
# This should be changed to whatever you set DocumentRoot to.
|
|
||||||
|
|
||||||
! <Directory /usr/local/www/data>
|
|
||||||
|
|
||||||
# This may also be "None", "All", or any combination of "Indexes",
|
|
||||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
|
||||||
***************
|
***************
|
||||||
*** 38,44 ****
|
*** 50,52 ****
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
--- 54,57 ----
|
||||||
# CGI directory exists, if you have that configured.
|
extern int is_fnmatch(const char *);
|
||||||
|
|
||||||
! <Directory /usr/local/etc/httpd/cgi-bin>
|
#endif /* !_FNMATCH_H_ */
|
||||||
AllowOverride None
|
+ #endif /* !FreeBSD */
|
||||||
Options None
|
*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997
|
||||||
</Directory>
|
--- src/main/fnmatch.c Wed Oct 22 22:40:52 1997
|
||||||
--- 38,44 ----
|
***************
|
||||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
*** 34,39 ****
|
||||||
# CGI directory exists, if you have that configured.
|
--- 34,40 ----
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
! <Directory /usr/local/www/cgi-bin>
|
+ #ifndef __FreeBSD__
|
||||||
AllowOverride None
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||||||
Options None
|
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
|
||||||
</Directory>
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
***************
|
||||||
|
*** 169,175 ****
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
!
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
--- 170,176 ----
|
||||||
|
}
|
||||||
|
return (ok == negate ? NULL : pattern);
|
||||||
|
}
|
||||||
|
! #endif /* !FreeBSD */
|
||||||
|
|
||||||
|
/* This function is an Apache addition */
|
||||||
|
/* return non-zero if pattern has any glob chars in it */
|
||||||
|
|
|
||||||
89
www/apache22/files/patch-ag
Normal file
89
www/apache22/files/patch-ag
Normal file
|
|
@ -0,0 +1,89 @@
|
||||||
|
*** conf/httpd.conf-dist.orig Thu Oct 16 22:55:54 1997
|
||||||
|
--- conf/httpd.conf-dist Wed Oct 22 20:58:36 1997
|
||||||
|
***************
|
||||||
|
*** 34,40 ****
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group #-1
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
--- 34,40 ----
|
||||||
|
# suggested workaround is to create a user www and use that user.
|
||||||
|
|
||||||
|
User nobody
|
||||||
|
! Group nogroup
|
||||||
|
|
||||||
|
# ServerAdmin: Your address, where problems with the server should be
|
||||||
|
# e-mailed.
|
||||||
|
***************
|
||||||
|
*** 56,76 ****
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog logs/error_log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog logs/access_log
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile logs/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile logs/apache_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
--- 56,78 ----
|
||||||
|
# ErrorLog: The location of the error log file. If this does not start
|
||||||
|
# with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! ErrorLog /var/log/httpd-error.log
|
||||||
|
|
||||||
|
# TransferLog: The location of the transfer log file. If this does not
|
||||||
|
# start with /, ServerRoot is prepended to it.
|
||||||
|
|
||||||
|
! TransferLog /var/log/httpd-access.log
|
||||||
|
!
|
||||||
|
! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
||||||
|
|
||||||
|
# PidFile: The file the server should log its pid to
|
||||||
|
! PidFile /var/run/httpd.pid
|
||||||
|
|
||||||
|
# ScoreBoardFile: File used to store internal server process information.
|
||||||
|
# Not all architectures require this. But if yours does (you'll know because
|
||||||
|
# this file is created when you run Apache) then you *must* ensure that
|
||||||
|
# no two invocations of Apache share the same scoreboard file.
|
||||||
|
! ScoreBoardFile /var/run/apache_runtime_status
|
||||||
|
|
||||||
|
# ServerName allows you to set a host name which is sent back to clients for
|
||||||
|
# your server if it's different than the one the program would get (i.e. use
|
||||||
|
***************
|
||||||
|
*** 175,184 ****
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /www/docs/host.some_domain.com
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog logs/host.some_domain.com-error_log
|
||||||
|
! #TransferLog logs/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
|
--- 177,186 ----
|
||||||
|
|
||||||
|
#<VirtualHost host.some_domain.com>
|
||||||
|
#ServerAdmin webmaster@host.some_domain.com
|
||||||
|
! #DocumentRoot /usr/local/www/host.some_domain.com/data
|
||||||
|
#ServerName host.some_domain.com
|
||||||
|
! #ErrorLog /var/log/host.some_domain.com-error_log
|
||||||
|
! #TransferLog /var/log/host.some_domain.com-access_log
|
||||||
|
#</VirtualHost>
|
||||||
|
|
||||||
|
|
||||||
50
www/apache22/files/patch-ak
Normal file
50
www/apache22/files/patch-ak
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
*** src/support/apachectl.orig Thu Oct 16 22:58:26 1997
|
||||||
|
--- src/support/apachectl Thu Oct 23 03:35:09 1997
|
||||||
|
***************
|
||||||
|
*** 21,30 ****
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/etc/httpd/src/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
--- 21,30 ----
|
||||||
|
# -------------------- --------------------
|
||||||
|
#
|
||||||
|
# the path to your PID file
|
||||||
|
! PIDFILE=/var/run/httpd.pid
|
||||||
|
#
|
||||||
|
# the path to your httpd binary
|
||||||
|
! HTTPD=/usr/local/sbin/httpd
|
||||||
|
#
|
||||||
|
# a command that outputs a formatted text version of the HTML at the
|
||||||
|
# url given on the command line. Designed for lynx, however other
|
||||||
|
***************
|
||||||
|
*** 33,42 ****
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/server-status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
|
--- 33,44 ----
|
||||||
|
#
|
||||||
|
# the URL to your server's mod_status status page. If you do not
|
||||||
|
# have one, then status and fullstatus will not work.
|
||||||
|
! STATUSURL="http://localhost/status"
|
||||||
|
#
|
||||||
|
# -------------------- --------------------
|
||||||
|
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
|
||||||
|
+
|
||||||
|
+ eval `limits -e -C daemon`
|
||||||
|
|
||||||
|
ERROR=0
|
||||||
|
ARGV="$@"
|
||||||
44
www/apache22/files/patch-al
Normal file
44
www/apache22/files/patch-al
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
*** src/support/log_server_status.bak Thu Oct 16 22:58:27 1997
|
||||||
|
--- src/support/log_server_status Thu Oct 23 00:13:07 1997
|
||||||
|
***************
|
||||||
|
*** 62,68 ****
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
--- 62,68 ----
|
||||||
|
#
|
||||||
|
require 'sys/socket.ph';
|
||||||
|
|
||||||
|
! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312"
|
||||||
|
$server = "localhost"; # Name of server, could be "www.foo.com"
|
||||||
|
$port = "80"; # Port on server
|
||||||
|
$request = "/status/?auto"; # Request to send
|
||||||
|
***************
|
||||||
|
*** 88,98 ****
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
--- 88,98 ----
|
||||||
|
### Main
|
||||||
|
|
||||||
|
{
|
||||||
|
! $date=`LC_TIME=C date +%y%m%d:%H%M%S`;
|
||||||
|
chop($date);
|
||||||
|
($day,$time)=split(/:/,$date);
|
||||||
|
$res=&tcp_connect($server,$port);
|
||||||
|
! open(OUT,">>$wherelog$day.log");
|
||||||
|
if ($res) {
|
||||||
|
print OUT "$time:-1:-1:-1:-1:$res\n";
|
||||||
|
exit 1;
|
||||||
|
|
@ -6,6 +6,15 @@ etc/apache/access.conf-dist
|
||||||
etc/apache/mime.types-dist
|
etc/apache/mime.types-dist
|
||||||
etc/apache/magic-dist
|
etc/apache/magic-dist
|
||||||
sbin/httpd
|
sbin/httpd
|
||||||
|
sbin/apachectl
|
||||||
|
sbin/dbmmanage
|
||||||
|
sbin/htdigest
|
||||||
|
sbin/htpasswd
|
||||||
|
sbin/log_server_status
|
||||||
|
sbin/logresolve
|
||||||
|
sbin/rotatelogs
|
||||||
|
man/man1/htpasswd.1.gz
|
||||||
|
man/man8/httpd.8.gz
|
||||||
www/icons/README
|
www/icons/README
|
||||||
www/icons/a.gif
|
www/icons/a.gif
|
||||||
www/icons/alert.black.gif
|
www/icons/alert.black.gif
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue