Permalink
Browse files

import form NetBSD-current pkgsrc/www/apache6

  • Loading branch information...
1 parent 7977a29 commit d604c76001e23574816aaf2f68c40e09453b5cd8 itojun committed Sep 1, 1999
@@ -1,71 +1,121 @@
-# New ports collection makefile for: apache HTTPD
-# Version required: 1.3*
-# Date created: Fri Aug 25 16:42:36 CDT 1995
-# Whom: ache@nagual.pp.ru
+# $NetBSD: Makefile,v 1.5 1999/09/01 07:41:01 itojun Exp $
#
-# $Id: Makefile,v 1.1.1.2 1999/08/10 09:14:59 itojun Exp $
+# The fourth number in the PKGNAME version indicates a NetBSD pkg revision
+# (to indicate changes in the shipped third party patches such as the mod_ssl
+# EAPI when there has been no change to the Apache version number).
+#
+# This package does not compile in mod_ssl support hooks, as it conflicts
+# with IPv6 enable patch.
+# IPv6 enable patch conflicts with third-party modules anyway, due to
+# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
#
-DISTNAME= apache_1.3.6
-PKGNAME= apache-1.3.6
-CATEGORIES= www
-MASTER_SITES= ftp://www.apache.org/dist/
+DISTNAME= apache_1.3.9
+PKGNAME= apache6-1.3.9
+CATEGORIES= www
+MASTER_SITES= http://www.apache.org/dist/ \
+ ftp://ftp.modssl.org/source/ \
+ http://www.netbsd.org/images/logos/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ sitedrivenby.gif
+# ${SSL_DISTNAME}${EXTRACT_SUFX}
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \
- ftp://ftp.v6.kame.net/pub/kame/misc/
-PATCHFILES= apache-136-v6-19990724.diff.gz
+PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES= apache-139-v6-19990901a.diff.gz
PATCH_DIST_STRIP= -p1
-MAINTAINER= itojun@kame.net
+MAINTAINER= itojun@itojun.org
+HOMEPAGE= http://www.apache.org/
-#
-# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
-#
+CONFLICTS= apache-*modssl-* apache-*
+
+SSL_DISTNAME= mod_ssl-2.2.8-1.3.6
-HAS_CONFIGURE= yes
+EXTRACT_ONLY= ${DISTFILES:N*.gif}
+HAS_CONFIGURE= YES
+CONFIGURE_ARGS+= --prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
+ --runtimedir=/var/run --datadir=${PREFIX}/share/httpd \
+ --logfiledir=/var/log/httpd --sysconfdir=${PREFIX}/etc/httpd \
+ --proxycachedir=/var/spool/httpd/proxy \
+ --includedir=${PREFIX}/include/httpd \
+ --sbindir=${PREFIX}/sbin \
+ --enable-module=most \
+ --enable-module=auth_db \
+ --disable-module=auth_dbm \
+ --with-perl=${PREFIX}/bin/perl
+# --enable-rule=EAPI --disable-module=ssl
CONFIGURE_SCRIPT= configure.v6
-CONFIGURE_ARGS= \
- --prefix=${PREFIX} \
- --sbindir=${PREFIX}/sbin \
- --sysconfdir=${PREFIX}/etc/apache \
- --includedir=${PREFIX}/include/apache \
- --logfiledir=/var/log \
- --runtimedir=/var/run \
- --datadir=${PREFIX}/www \
- --proxycachedir=${PREFIX}/www/proxy \
- --libexecdir=${PREFIX}/libexec/apache \
- --without-confadjust \
- --enable-shared=remain \
- --enable-module=most \
- --enable-module=auth_db \
- --disable-module=auth_dbm
-
-# Currently perl version don't matter
-# --with-perl=${PERL5}
-
-OPTIM=-DHARD_SERVER_LIMIT=512 \
--DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
--DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+CONFIGURE_ENV+= OPTIM="${OPTIM}"
+
+.include "../../mk/bsd.prefs.mk"
+
+CHMOD?= chmod
+
+#.if !defined(USE_INET6)
+#BROKEN= "IPv6 only build"
+#.endif
+
+.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
+CONFIGURE_ARGS+= --enable-suexec --suexec-caller=www \
+ --suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin'
+.endif
.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+= -DBUFFERED_LOGS
-CFLAGS+= -O6 -fomit-frame-pointer
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
.endif
-CONFIGURE_ENV= OPTIM='${OPTIM}'
+PLIST_SRC= ${WRKDIR}/PLIST
+
+BUILD_DEFS+= APACHE_PERF_TUNING APACHE_SUEXEC USE_INET6
+
+# Note that there is NO static compile module hook here. This is intentional.
+# Under Apache 1.3, modules can be compiled to link dynamically to the server
+# using the "apxs" program. See apxs(8).
+
+#post-extract:
+# @${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include/
+# @${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.c ${WRKSRC}/src/ap/
+# @${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include/
-MAN1= htdigest.1 htpasswd.1
-MAN8= apachectl.8 ab.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+#pre-patch:
+# @cd ${WRKSRC} && ${CAT} \
+# ../${SSL_DISTNAME}/pkg.eapi/eapi.patch \
+# ../${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \
+# ../${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \
+# ../${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \
+# | ${PATCH} ${PATCH_ARGS}
+# @cd ${WRKSRC} && tail +129 \
+# ../${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
+# | ${PATCH} ${PATCH_ARGS}
post-patch:
- chmod +x ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @find ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM}
+ @${CHMOD} +x ${WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-build:
+ ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/apache.sh \
+ >${WRKDIR}/apache.sh
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 ${PREFIX}/bin/apachectl ] && ${PREFIX}/bin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
- chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
+ ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \
+ ${PREFIX}/share/httpd/htdocs
+ ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh
+ @${MV} ${PREFIX}/lib/httpd/libproxy.so \
+ ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || \
+ ${MKDIR} ${PREFIX}/lib/httpd
+ @${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+.for FILE in man/man8/suexec.8 sbin/suexec
+ @if [ -e ${PREFIX}/${FILE} ]; then \
+ ${ECHO} ${FILE} >>${PLIST_SRC}; \
fi
+.endfor
.include "../../mk/bsd.pkg.mk"
+
+.if !defined(NOPIC)
+CONFIGURE_ARGS+= --enable-module=so --enable-shared=proxy
+.else
+CONFIGURE_ARGS+= --disable-module=proxy
+.endif
@@ -0,0 +1,83 @@
+/* $NetBSD: ap_include_extern.h,v 1.1.1.1 1999/07/23 17:53:29 itojun Exp $ */
+/* ====================================================================
+ * Copyright (c) 1998 The Apache Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+
+#ifndef AP_INCLUDE_EXTERN_H
+#define AP_INCLUDE_EXTERN_H
+
+/*
+ * XSSI extensibility hooks.
+ *
+ * This allows other modules to "hook" themselves into the Apache XSSI
+ * (mod_include) handler list without requiring modification to the
+ * mod_include source code.
+ */
+
+typedef int (*ap_include_extern_func)(FILE *fp, request_rec *r,
+ const char *error, const char *timefmt);
+
+/* The const char * argument is the command word used to find this hook. */
+API_EXPORT(int) ap_include_register_extern(const char *, ap_include_extern_func);
+
+/* Formerly a static "get_tag()" in mod_include.c */
+API_EXPORT(char *) ap_include_get_tag(pool *, FILE *, char *, int, int);
+
+/* Formerly a static "parse_string()" in mod_include.c */
+API_EXPORT(void) ap_include_parse_string(request_rec *, const char *,
+ char *, size_t, int);
+
+#endif
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $NetBSD: apache.sh,v 1.1.1.1 1999/07/23 17:53:29 itojun Exp $
+#
+if [ -x @PREFIX@/sbin/httpd -a -f @PREFIX@/etc/httpd/httpd.conf ]
+then
+ @PREFIX@/sbin/apachectl start >/dev/null
+ echo -n ' apache'
+fi
+exit 0
@@ -1,4 +1,5 @@
-$NetBSD$
+$NetBSD: md5,v 1.3 1999/09/01 07:41:02 itojun Exp $
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (apache-136-v6-19990724.diff.gz) = cab405b60a916219f90bd048a2078616
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
+MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
+MD5 (apache-139-v6-19990901a.diff.gz) = 64fea82095fbc58a5367551f9e686483
@@ -0,0 +1,10 @@
+$NetBSD: patch-sum,v 1.3 1999/09/01 07:41:02 itojun Exp $
+
+MD5 (patch-aa) = 7cdc55b80eb5389605960973c6c888ad
+MD5 (patch-ab) = 4b835238ed8e929366119786655a0ffc
+MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069
+MD5 (patch-ah) = c3e3a232e0c5028a15dea4473bf39955
+MD5 (patch-aj) = e4878583ffc2957e50c25d3d22d1d4db
+MD5 (patch-ak) = f025ef3f85f08ba8374148f3dcc0eccf
+MD5 (patch-al) = 392b4228824401ad7d1676d2054fa1d6
+MD5 (patch-am) = 06fcd06d209d53e87b02e94707bdd21c
@@ -1,24 +1,28 @@
---- configure.orig Sat Jan 2 05:19:41 1999
-+++ configure Tue Jan 12 06:02:12 1999
-@@ -1012,8 +1012,8 @@
- echo " DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
- echo " DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
- echo " DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
-- echo " DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
-- echo " DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+ echo " DEFAULT_XFERLOG: ${logfiledir_relative}http-access_log"
-+ echo " DEFAULT_ERRORLOG: ${logfiledir_relative}http-error_log"
- echo " TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
- echo " SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
- echo " ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1091,8 +1091,8 @@
- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
- echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
- echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
--echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
--echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}http-access_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}http-error_log\"'" >>$src/apaci
- echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
- echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
- echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
+$NetBSD: patch-aa,v 1.3 1999/09/01 07:41:03 itojun Exp $
+
+--- Makefile.tmpl.orig Thu Aug 12 23:58:18 1999
++++ Makefile.tmpl Wed Sep 1 00:08:27 1999
+@@ -450,12 +450,13 @@
+ find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+ find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+ fi
+- -@if [ -f $(root)$(cgidir)/printenv ]; then \
++ -@if false; then \
+ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+ else \
+ for script in printenv test-cgi; do \
+ cat $(TOP)/cgi-bin/$${script} |\
+ sed -e 's;^#!/.*perl;#!$(PERL);' \
++ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp; \
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+@@ -472,7 +473,7 @@
+ # and initial config files while preserving existing ones.
+ install-config:
+ @echo "===> [config: Installing Apache configuration files]"
+- -@for conf in httpd.conf access.conf srm.conf; do \
++ -@for conf in httpd.conf; do \
+ if [ .$$conf = .httpd.conf ]; then \
+ target_conf="$(TARGET).conf"; \
+ else \
Oops, something went wrong.

0 comments on commit d604c76

Please sign in to comment.