This commit is contained in:
joey 1997-11-17 23:01:02 +00:00
parent 718eed7973
commit c1e0b78e65
16 changed files with 671 additions and 0 deletions

35
www/apache/Makefile Normal file
View File

@ -0,0 +1,35 @@
# New ports collection makefile for: apache HTTPD
# Version required: 1.3a1
# Date created: 17 Nov 1997
# Whom: ejovi
#
# $OpenBSD: Makefile,v 1.1.1.1 1997/11/17 23:01:02 joey Exp $
#
DISTNAME= apache_1.3a1
PKGNAME= apache-1.3a1
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/
MAINTAINER= joey@OpenBSD.ORG
# Set it for local-supplied patch, f.e.
# VERS_ID = mods-1.0/me
.if defined(VERS_ID)
post-patch:
@cd ${WRKSRC}/src && \
mv Configuration Configuration.old && \
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
< Configuration.old > Configuration
.endif
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
fi
.include <bsd.port.mk>

32
www/apache/files/Makefile Normal file
View File

@ -0,0 +1,32 @@
#
# Makefile for building and installing apache
#
all::
cd src; ${MAKE} PREFIX=@@PREFIX@@ $@
configure::
cd src; ./Configure
INSTALL_FILE=${INSTALL} -c -m 644 -o bin -g bin
CONF_DIR= @@PREFIX@@/etc/apache
install::
-mkdir -p ${CONF_DIR}
-mkdir -p @@PREFIX@@/www/data
-mkdir -p @@PREFIX@@/www/icons
-mkdir -p @@PREFIX@@/www/cgi-bin
${INSTALL} -c -s -m 755 -o root src/httpd @@PREFIX@@/sbin
${INSTALL} -c -m 644 -o nobody icons/* @@PREFIX@@/www/icons
for file in httpd.conf srm.conf access.conf ; do \
if [ ! -f ${CONF_DIR}/$$file ] ; then \
${INSTALL_FILE} conf/$$file-dist ${CONF_DIR}/$$file ; \
fi ; \
${INSTALL_FILE} conf/$$file-dist ${CONF_DIR} ; \
done
for file in mime.types magic ; do \
if [ ! -f ${CONF_DIR}/$$file ] ; then \
${INSTALL_FILE} conf/$$file ${CONF_DIR} ; \
fi ; \
${INSTALL_FILE} conf/$$file ${CONF_DIR}/$${file}-dist ; \
done

View File

@ -0,0 +1,39 @@
#
# Makefile for building and installing secure apache
#
all::
cd src; ${MAKE} PREFIX=@@PREFIX@@ $@
configure::
cd src; ./Configure
certificate::
cd src; ${MAKE} PREFIX=@@PREFIX@@ $@
INSTALL_FILE=${INSTALL} -c -m 644 -o bin -g bin
CONF_DIR= @@PREFIX@@/etc/apache
install::
-mkdir -p ${CONF_DIR}
-mkdir -p @@PREFIX@@/www/data
-mkdir -p @@PREFIX@@/www/icons
-mkdir -p @@PREFIX@@/www/cgi-bin
${INSTALL} -c -s -m 755 -o root src/httpsd @@PREFIX@@/sbin
${INSTALL} -c -m 644 -o nobody icons/* @@PREFIX@@/www/icons
for file in httpd.conf srm.conf access.conf ; do \
if [ -f ${CONF_DIR}/$$file ] ; then \
${INSTALL_FILE} conf/$$file-dist ${CONF_DIR} ; \
else \
${INSTALL_FILE} conf/$$file-dist ${CONF_DIR}/$$file ; \
fi ; \
done
for file in httpd.conf ; do \
${INSTALL_FILE} SSLconf/conf/$$file ${CONF_DIR}/$$file-SSL ; \
done
if [ -f ${CONF_DIR}/mime.types ] ; then \
${INSTALL_FILE} conf/mime.types ${CONF_DIR}/mime.types-dist ; \
else \
${INSTALL_FILE} conf/mime.types ${CONF_DIR} ; \
fi ; \
${INSTALL_FILE} SSLconf/conf/mime.types ${CONF_DIR}/mime.types-SSL ; \

1
www/apache/files/md5 Normal file
View File

@ -0,0 +1 @@
MD5 (apache_1.3a1.tar.gz) = 638fad5c69178d2a92407900547e8732

149
www/apache/patches/patch-aa Normal file
View File

@ -0,0 +1,149 @@
*** src/Configuration.orig Wed Jul 23 04:11:59 1997
--- src/Configuration Thu Jul 24 05:55:25 1997
***************
*** 41,49 ****
# Settings here have priority; If not set, Configure will attempt to guess
# the C compiler, and set OPTIM to '-O2'
#
! EXTRA_CFLAGS=
EXTRA_LDFLAGS=
! EXTRA_LIBS=
EXTRA_INCLUDES=
#CC=
--- 41,63 ----
# Settings here have priority; If not set, Configure will attempt to guess
# the C compiler, and set OPTIM to '-O2'
#
! EXTRA_CFLAGS= \
! -DHTTPD_ROOT=\"${PREFIX}/etc/apache/\" \
! -DDOCUMENT_LOCATION=\"${PREFIX}/www/data/\" \
! -DSERVER_CONFIG_FILE=\"httpd.conf\" \
! -DRESOURCE_CONFIG_FILE=\"srm.conf\" \
! -DTYPES_CONFIG_FILE=\"mime.types\" \
! -DACCESS_CONFIG_FILE=\"access.conf\" \
! -DDEFAULT_PATH=\"/bin:/usr/bin:${PREFIX}/bin\" \
! -DSUEXEC_BIN=\"${PREFIX}/sbin/suexec\" \
! -DDEFAULT_XFERLOG=\"/var/log/httpd-access.log\" \
! -DDEFAULT_ERRORLOG=\"/var/log/httpd-error.log\" \
! -DDEFAULT_PIDLOG=\"/var/run/httpd.pid\" \
! -DDEFAULT_SCOREBOARD=\"/var/run/apache_runtime_status\" \
! -DDEFAULT_LOCKFILE=\"/var/spool/lock/accept.lock\" \
! -DMAGIC=\"magic\"
EXTRA_LDFLAGS=
! EXTRA_LIBS=
EXTRA_INCLUDES=
#CC=
***************
*** 172,183 ****
## STATUS=yes (see the Rules section near the start of this file) to allow
## full status information. Check conf/access.conf on how to enable this.
! # Module status_module mod_status.o
## The Info module displays configuration information for the server and
## all included modules. It's very useful for debugging.
! # Module info_module mod_info.o
## mod_include translates server-side include (SSI) statements in text files.
## mod_autoindex handles requests for directories which have no index file
--- 186,197 ----
## STATUS=yes (see the Rules section near the start of this file) to allow
## full status information. Check conf/access.conf on how to enable this.
! Module status_module mod_status.o
## The Info module displays configuration information for the server and
## all included modules. It's very useful for debugging.
! Module info_module mod_info.o
## mod_include translates server-side include (SSI) statements in text files.
## mod_autoindex handles requests for directories which have no index file
***************
*** 221,227 ****
## mod_rewrite allows for powerful URI-to-URI and URI-to-filename mapping,
## using regular expressions.
! # Module rewrite_module mod_rewrite.o
##
## Access control and authentication modules.
--- 235,241 ----
## mod_rewrite allows for powerful URI-to-URI and URI-to-filename mapping,
## using regular expressions.
! Module rewrite_module mod_rewrite.o
##
## Access control and authentication modules.
***************
*** 239,245 ****
## "gdbm" package if not and possibly adjust EXTRA_LIBS. (This may be
## done by Configure at a later date)
! # Module db_auth_module mod_auth_db.o
# Module dbm_auth_module mod_auth_dbm.o
## msql_auth checks against an mSQL database. You must have mSQL installed
--- 253,259 ----
## "gdbm" package if not and possibly adjust EXTRA_LIBS. (This may be
## done by Configure at a later date)
! Module db_auth_module mod_auth_db.o
# Module dbm_auth_module mod_auth_dbm.o
## msql_auth checks against an mSQL database. You must have mSQL installed
***************
*** 256,279 ****
## "digest" implements HTTP Digest Authentication rather than the less
## secure Basic Auth used by the other modules.
! # Module digest_module mod_digest.o
## Optional response header manipulation modules.
##
## cern_meta mimics the behavior of the CERN web server with regards to
## metainformation files.
! # Module cern_meta_module mod_cern_meta.o
## The expires module can apply Expires: headers to resources,
## as a function of access time or modification time.
! # Module expires_module mod_expires.o
## The headers module can set arbitrary HTTP response headers,
## as configured in server, vhost, access.conf or .htaccess configs
! # Module headers_module mod_headers.o
## Miscellaneous modules
##
--- 270,293 ----
## "digest" implements HTTP Digest Authentication rather than the less
## secure Basic Auth used by the other modules.
! Module digest_module mod_digest.o
## Optional response header manipulation modules.
##
## cern_meta mimics the behavior of the CERN web server with regards to
## metainformation files.
! Module cern_meta_module mod_cern_meta.o
## The expires module can apply Expires: headers to resources,
## as a function of access time or modification time.
! Module expires_module mod_expires.o
## The headers module can set arbitrary HTTP response headers,
## as configured in server, vhost, access.conf or .htaccess configs
! Module headers_module mod_headers.o
## Miscellaneous modules
##

View File

@ -0,0 +1,36 @@
*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
--- conf/access.conf-dist Fri Jul 5 06:32:54 1996
***************
*** 12,18 ****
# This should be changed to whatever you set DocumentRoot to.
! <Directory /usr/local/etc/httpd/htdocs>
# 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 ****
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
! <Directory /usr/local/etc/httpd/cgi-bin>
AllowOverride None
Options None
</Directory>
--- 38,44 ----
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
! <Directory /usr/local/www/cgi-bin>
AllowOverride None
Options None
</Directory>

View File

@ -0,0 +1,79 @@
*** src/httpd.h.orig Wed Jul 23 04:06:06 1997
--- src/httpd.h Thu Jul 24 04:55:02 1997
***************
*** 77,82 ****
--- 77,83 ----
#endif
#endif
+ #ifndef DOCUMENT_LOCATION
/* Root of server */
#ifdef __EMX__
/* Set default for OS/2 file system */
***************
*** 84,89 ****
--- 85,91 ----
#else
#define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs"
#endif
+ #endif
/* Max. number of dynamically loaded modules */
#define DYNAMIC_MODULE_LIMIT 64
***************
*** 115,135 ****
--- 117,147 ----
#endif
/* The name of the log files */
+ #ifndef DEFAULT_XFERLOG
#ifdef __EMX__
/* Set default for OS/2 file system */
#define DEFAULT_XFERLOG "logs/access.log"
#else
#define DEFAULT_XFERLOG "logs/access_log"
#endif
+ #endif /* DEFAULT_XFERLOG */
+ #ifndef DEFAULT_ERRORLOG
#ifdef __EMX__
/* Set default for OS/2 file system */
#define DEFAULT_ERRORLOG "logs/error.log"
#else
#define DEFAULT_ERRORLOG "logs/error_log"
#endif
+ #endif /* DEFAULT_ERRORLOG */
+ #ifndef DEFAULT_PIDLOG
#define DEFAULT_PIDLOG "logs/httpd.pid"
+ #endif
+ #ifndef DEFAULT_SCOREBOARD
#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
+ #endif
+ #ifndef DEFAULT_LOCKFILE
#define DEFAULT_LOCKFILE "logs/accept.lock"
+ #endif
/* Define this to be what your HTML directory content files are called */
#define DEFAULT_INDEX "index.html"
***************
*** 154,167 ****
--- 166,185 ----
#define SERVER_CONFIG_FILE "conf/httpd.conf"
#endif
+ #ifndef RESOURCE_CONFIG_FILE
/* The name of the document config file */
#define RESOURCE_CONFIG_FILE "conf/srm.conf"
+ #endif
+ #ifndef TYPES_CONFIG_FILE
/* The name of the MIME types file */
#define TYPES_CONFIG_FILE "conf/mime.types"
+ #endif
+ #ifndef ACCESS_CONFIG_FILE
/* The name of the access file */
#define ACCESS_CONFIG_FILE "conf/access.conf"
+ #endif
/* Whether we should enable rfc1413 identity checking */
#define DEFAULT_RFC1413 0

View File

@ -0,0 +1,19 @@
*** src/Makefile.tmpl.orig Thu Jul 17 08:37:46 1997
--- src/Makefile.tmpl Tue Aug 26 02:58:54 1997
***************
*** 3,9 ****
# This is combined with the information in the "Configuration" file
# by the configure script to make the actual Makefile.
! CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
--- 3,9 ----
# This is combined with the information in the "Configuration" file
# by the configure script to make the actual Makefile.
! CFLAGS+=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)

106
www/apache/patches/patch-ae Normal file
View File

@ -0,0 +1,106 @@
*** conf/httpd.conf-dist.orig Wed Jul 16 09:02:44 1997
--- conf/httpd.conf-dist Thu Jul 24 05:13:38 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.
***************
*** 44,50 ****
# ServerRoot: The directory the server's config, error, and log files
# are kept in
! ServerRoot /usr/local/etc/httpd
# BindAddress: You can support virtual hosts with this option. This option
# is used to tell the server which IP address to listen to. It can either
--- 44,50 ----
# ServerRoot: The directory the server's config, error, and log files
# are kept in
! ServerRoot /usr/local/etc/apache
# BindAddress: You can support virtual hosts with this option. This option
# is used to tell the server which IP address to listen to. It can either
***************
*** 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>

View File

@ -0,0 +1,12 @@
*** src/conf.h.orig Mon Jul 21 07:37:48 1997
--- src/conf.h Thu Jul 24 05:09:25 1997
***************
*** 416,421 ****
--- 416,422 ----
#undef NO_SETSID
#define JMP_BUF sigjmp_buf
#define HAVE_MMAP
+ #define HAVE_SNPRINTF
#define DEFAULT_USER "nobody"
#define DEFAULT_GROUP "nogroup"
#if defined(__bsdi__) || \

View File

@ -0,0 +1,46 @@
*** conf/srm.conf-dist.orig Wed May 7 23:21:47 1997
--- conf/srm.conf-dist Sat May 31 23:31:47 1997
***************
*** 12,18 ****
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
! DocumentRoot /usr/local/etc/httpd/htdocs
# UserDir: The name of the directory which is appended onto a user's home
# directory if a ~user request is recieved.
--- 12,18 ----
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
! DocumentRoot /usr/local/www/data
# UserDir: The name of the directory which is appended onto a user's home
# directory if a ~user request is recieved.
***************
*** 135,146 ****
# require it to be present in the URL. So "/icons" isn't aliased in this
# example.
! #Alias /icons/ /usr/local/etc/httpd/icons/
# ScriptAlias: This controls which directories contain server scripts.
# Format: ScriptAlias fakename realname
! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
# If you want to use server side includes, or CGI outside
# ScriptAliased directories, uncomment the following lines.
--- 135,146 ----
# require it to be present in the URL. So "/icons" isn't aliased in this
# example.
! Alias /icons/ /usr/local/www/icons/
# ScriptAlias: This controls which directories contain server scripts.
# Format: ScriptAlias fakename realname
! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
# If you want to use server side includes, or CGI outside
# ScriptAliased directories, uncomment the following lines.

View File

@ -0,0 +1,13 @@
--- src/Configure.orig Mon Nov 17 13:49:29 1997
+++ src/Configure Mon Nov 17 13:49:54 1997
@@ -170,8 +170,8 @@
####################################################################
# Preset some "constants"; can be overridden on a per-platform basis below.
#
-DBM_LIB="-ldbm"
-DB_LIB="-ldb"
+DBM_LIB=""
+DB_LIB=""
SHELL="/bin/sh"
if ./helpers/PrintPath -s ranlib; then
RANLIB="ranlib"

1
www/apache/pkg/COMMENT Normal file
View File

@ -0,0 +1 @@
The extremely popular Apache http server. Very fast, very clean.

15
www/apache/pkg/DESCR Normal file
View File

@ -0,0 +1,15 @@
Apache
Version 1.0 (and up)
What is it?
-----------
Apache is an HTTP server designed as a plug-in replacement for the NCSA
server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and
includes many frequently requested new features, and has an API which
allows it to be extended to meet users' needs more easily.
Documentation
-------------
All the documentation is on-line on the WWW, via the URL http://www.apache.org

84
www/apache/pkg/PLIST Normal file
View File

@ -0,0 +1,84 @@
etc/rc.d/apache.sh
@exec mkdir -p %D/www/cgi-bin %D/www/data
etc/apache/httpd.conf-dist
etc/apache/srm.conf-dist
etc/apache/access.conf-dist
etc/apache/mime.types-dist
etc/apache/magic-dist
sbin/httpd
www/icons/README
www/icons/a.gif
www/icons/alert.black.gif
www/icons/alert.red.gif
www/icons/apache_pb.gif
www/icons/back.gif
www/icons/ball.gray.gif
www/icons/ball.red.gif
www/icons/binary.gif
www/icons/binhex.gif
www/icons/blank.gif
www/icons/bomb.gif
www/icons/box1.gif
www/icons/box2.gif
www/icons/broken.gif
www/icons/burst.gif
www/icons/c.gif
www/icons/comp.blue.gif
www/icons/comp.gray.gif
www/icons/compressed.gif
www/icons/continued.gif
www/icons/dir.gif
www/icons/down.gif
www/icons/dvi.gif
www/icons/f.gif
www/icons/folder.gif
www/icons/folder.open.gif
www/icons/folder.sec.gif
www/icons/forward.gif
www/icons/generic.gif
www/icons/generic.red.gif
www/icons/generic.sec.gif
www/icons/hand.right.gif
www/icons/hand.up.gif
www/icons/icon.sheet.gif
www/icons/image1.gif
www/icons/image2.gif
www/icons/image3.gif
www/icons/index.gif
www/icons/layout.gif
www/icons/left.gif
www/icons/link.gif
www/icons/movie.gif
www/icons/p.gif
www/icons/patch.gif
www/icons/pdf.gif
www/icons/pie0.gif
www/icons/pie1.gif
www/icons/pie2.gif
www/icons/pie3.gif
www/icons/pie4.gif
www/icons/pie5.gif
www/icons/pie6.gif
www/icons/pie7.gif
www/icons/pie8.gif
www/icons/portal.gif
www/icons/ps.gif
www/icons/quill.gif
www/icons/right.gif
www/icons/screw1.gif
www/icons/screw2.gif
www/icons/script.gif
www/icons/sound1.gif
www/icons/sound2.gif
www/icons/sphere1.gif
www/icons/sphere2.gif
www/icons/tar.gif
www/icons/tex.gif
www/icons/text.gif
www/icons/transfer.gif
www/icons/unknown.gif
www/icons/up.gif
www/icons/uu.gif
www/icons/uuencoded.gif
www/icons/world1.gif
www/icons/world2.gif

4
www/apache/scripts/configure vendored Normal file
View File

@ -0,0 +1,4 @@
#!/bin/sh
echo "Making Makefile"
sed -e "s;@@PREFIX@@;${PREFIX};" $FILESDIR/Makefile >$WRKSRC/Makefile
cd $WRKSRC/src ; sh ./Configure