pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/apache22 Apache 2.2.3 - latest stable version.
details: https://anonhg.NetBSD.org/pkgsrc/rev/9a7926615f97
branches: trunk
changeset: 522408:9a7926615f97
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Fri Dec 08 23:31:52 2006 +0000
description:
Apache 2.2.3 - latest stable version.
Please see http://httpd.apache.org/docs/2.2/new_features_2_2.html
for the list of changes.
diffstat:
www/apache22/DESCR | 5 +
www/apache22/Makefile | 254 +++++++++
www/apache22/Makefile.common | 12 +
www/apache22/PLIST | 1097 +++++++++++++++++++++++++++++++++++++++++
www/apache22/PLIST.worker | 3 +
www/apache22/buildlink3.mk | 32 +
www/apache22/distinfo | 14 +
www/apache22/files/apache.sh | 58 ++
www/apache22/files/mkcert.sh | 913 ++++++++++++++++++++++++++++++++++
www/apache22/options.mk | 28 +
www/apache22/patches/patch-aa | 145 +++++
www/apache22/patches/patch-ab | 13 +
www/apache22/patches/patch-ac | 12 +
www/apache22/patches/patch-ad | 31 +
www/apache22/patches/patch-ae | 53 +
www/apache22/patches/patch-ag | 16 +
www/apache22/patches/patch-ai | 19 +
www/apache22/patches/patch-al | 31 +
www/apache22/patches/patch-am | 13 +
19 files changed, 2749 insertions(+), 0 deletions(-)
diffs (truncated from 2825 to 300 lines):
diff -r 87638b80f1ab -r 9a7926615f97 www/apache22/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache22/DESCR Fri Dec 08 23:31:52 2006 +0000
@@ -0,0 +1,5 @@
+The Apache HTTP Server Project is an effort to develop and maintain an
+open-source HTTP server for various modern desktop and server operating
+systems, such as UNIX and Windows NT. The goal of this project is to
+provide a secure, efficient and extensible server which provides HTTP
+services in sync with the current HTTP standards.
diff -r 87638b80f1ab -r 9a7926615f97 www/apache22/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache22/Makefile Fri Dec 08 23:31:52 2006 +0000
@@ -0,0 +1,254 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+.include "Makefile.common"
+
+PKGNAME= apache-${APACHE_VERSION}
+#PKGREVISION= 1
+CATEGORIES= www
+
+HOMEPAGE= http://httpd.apache.org/
+COMMENT= Apache HTTP (Web) server, version 2
+
+CONFLICTS= apache-{,*ssl}-[0-9]* apache-[0-9]* apache6-[0-9]*
+
+BUILD_DEFS+= USE_INET6
+BUILD_DEFS+= VARBASE
+
+USE_TOOLS+= perl perl:run pkg-config
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-layout=NetBSD
+CONFIGURE_ARGS+= --with-port=80
+CONFIGURE_ARGS+= --enable-so
+CONFIGURE_ENV+= perlbin=${PERL5:Q}
+
+# Apache Portable Runtime library configure options
+CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
+CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr}
+
+CHECK_PORTABILITY_SKIP+= srclib/pcre/* \
+ srclib/apr-util/* \
+ srclib/apr/*
+
+# the following must be set before bsd.prefs.mk in order to make += work
+# in mk.conf; however, it isn't expanded until referenced, so we can
+# define DFLT_APACHE_MODULES later
+#
+APACHE_MODULES?= ${DFLT_APACHE_MODULES}
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../devel/apr1/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+
+# Set the "Multi-Processing Model" used by Apache to handle requests.
+# Valid values are:
+# event multi-threaded based in worker, designed
+# to allow more requests to be served
+# simultaneously by passing off some processing
+# work to supporting threads.
+# BEWARE: does not work with SSL or input filters.
+# prefork non-threaded, pre-forking web server
+# worker hybrid multi-threaded multi-process web server
+#
+APACHE_MPM?= prefork
+CONFIGURE_ARGS+= --with-mpm=${APACHE_MPM:Q}
+BUILD_DEFS+= APACHE_MPM
+
+.if !empty(APACHE_MPM:Mevent) || !empty(APACHE_MPM:Mworker)
+PLIST_SRC+= ${PKGDIR}/PLIST.worker
+.endif
+
+CONFIGURE_ARGS+= --disable-access
+CONFIGURE_ARGS+= --disable-auth
+CONFIGURE_ARGS+= --disable-include
+CONFIGURE_ARGS+= --disable-log-config
+CONFIGURE_ARGS+= --disable-env
+CONFIGURE_ARGS+= --disable-mime
+CONFIGURE_ARGS+= --disable-setenvif
+CONFIGURE_ARGS+= --disable-status
+CONFIGURE_ARGS+= --disable-autoindex
+CONFIGURE_ARGS+= --disable-asis
+CONFIGURE_ARGS+= --disable-cgi
+CONFIGURE_ARGS+= --disable-negotiation
+CONFIGURE_ARGS+= --disable-dir
+CONFIGURE_ARGS+= --disable-imap
+CONFIGURE_ARGS+= --disable-actions
+CONFIGURE_ARGS+= --disable-userdir
+CONFIGURE_ARGS+= --disable-alias
+
+DFLT_APACHE_MODULES= all
+DFLT_APACHE_MODULES+= proxy proxy_connect proxy_ftp proxy_http
+DFLT_APACHE_MODULES+= ssl deflate access auth authn_alias
+DFLT_APACHE_MODULES+= include log_config env mime setenvif
+DFLT_APACHE_MODULES+= status autoindex asis cgi negotiation dir imap
+DFLT_APACHE_MODULES+= actions userdir alias isapi file_cache
+DFLT_APACHE_MODULES+= cache disk_cache mem_cache bucketeer echo
+DFLT_APACHE_MODULES+= example case_filter case_filter_in
+DFLT_APACHE_MODULES+= charset_lite
+
+PLIST_SRC+= ${PKGDIR}/PLIST
+
+# LDAP support
+.if !empty(PKG_BUILD_OPTIONS.apr:Mldap)
+DFLT_APACHE_MODULES+= ldap auth_ldap
+.endif
+
+# APACHE_MODULES are the modules that are linked statically into the
+# apache httpd executable.
+#
+CONFIGURE_ARGS+= --enable-modules=${APACHE_MODULES:Q}
+BUILD_DEFS+= APACHE_MODULES
+
+APACHE_USER?= www
+APACHE_GROUP?= www
+PKG_GROUPS= ${APACHE_GROUP}
+PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
+BUILD_DEFS+= APACHE_USER APACHE_GROUP
+
+PKG_SYSCONFVAR= apache
+PKG_SYSCONFSUBDIR?= httpd
+EGDIR= ${PREFIX}/share/examples/httpd
+SBINDIR= ${PREFIX}/sbin
+CONF_FILES+= ${EGDIR}/httpd.conf ${PKG_SYSCONFDIR}/httpd.conf
+.for f in autoindex dav default info languages manual mpm \
+ multilang-errordoc ssl userdir vhosts
+CONF_FILES+= ${EGDIR}/extra/httpd-${f}.conf \
+ ${PKG_SYSCONFDIR}/httpd-${f}.conf
+.endfor
+CONF_FILES+= ${EGDIR}/magic ${PKG_SYSCONFDIR}/magic
+CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+RCD_SCRIPTS= apache
+
+REQD_DIRS= ${PREFIX}/share/httpd
+REQD_DIRS+= ${PREFIX}/share/httpd/htdocs
+OWN_DIRS= ${VARBASE}/log/httpd
+OWN_DIRS+= ${VARBASE}/db/httpd
+OWN_DIRS_PERMS+= ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
+FIX_PERMS= apachectl apxs dbmmanage envvars-std mkcert
+FIX_MAN_PERMS= man1/htdbm.1 man1/htpasswd.1 man1/htdigest.1
+FIX_MAN_PERMS+= man1/dbmmanage.1 man8/httpd.8 man8/suexec.8
+FIX_MAN_PERMS+= man8/rotatelogs.8 man8/logresolve.8 man8/apxs.8
+FIX_MAN_PERMS+= man8/apachectl.8 man8/ab.8
+
+# Fix paths in the apache manpages.
+SUBST_CLASSES+= man
+SUBST_STAGE.man= post-patch
+SUBST_FILES.man= docs/man/*.1 docs/man/*.8
+SUBST_SED.man= -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
+SUBST_SED.man+= -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},'
+SUBST_SED.man+= -e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,'
+SUBST_SED.man+= -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
+
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= config.layout Makefile.in support/apxs.in
+SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.paths+= -e "s|@VARBASE@|${VARBASE}|g"
+SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_SED.paths+= -e "s|@PAX@|${PAX}|g"
+SUBST_SED.paths+= -e "s|@LOCALBASE@|${LOCALBASE}|g"
+SUBST_MESSAGE.paths= Fixing paths.
+
+SUBST_CLASSES+= apr-lt
+SUBST_STAGE.apr-lt= post-configure
+SUBST_FILES.apr-lt= build/config_vars.mk
+SUBST_SED.apr-lt= -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g'
+SUBST_MESSAGE.apr-lt= Fixing libtool references.
+
+SUBST_CLASSES+= confs
+SUBST_STAGE.confs= post-configure
+SUBST_MESSAGE.confs= Fixing configuration files.
+SUBST_FILES.confs= docs/conf/httpd.conf
+SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf
+SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"
+SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g"
+SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g"
+SUBST_SED.confs+= -e "s|logs/|${VARBASE}/log/httpd/|g"
+SUBST_SED.confs+= -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g'
+SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g'
+SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g'
+
+.include "options.mk"
+
+# Add dependencies for the modules that will be built. For each module
+# ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace
+# separated list of dependencies or buildlink3.mk files needed to build
+# ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of
+# configure script options for ap_mod.
+#
+AP_DEPENDS.ssl= ../../security/openssl/buildlink3.mk
+AP_DEPENDS.deflate= ../../devel/zlib/buildlink3.mk
+
+AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl}
+AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib}
+
+.for ap_mod in ${APACHE_MODULES}
+. if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod})
+. for ap_depend in ${AP_DEPENDS.${ap_mod}}
+. if exists(${ap_depend})
+. include "${ap_depend}"
+. else
+DEPENDS+= ${ap_depend}
+. endif
+. endfor
+. endif
+. if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod})
+CONFIGURE_ARGS+= ${AP_CFG_ARGS.${ap_mod}}
+. endif
+.endfor
+
+post-extract:
+ ${TOUCH} ${WRKSRC}/build/libtool
+
+post-build:
+ ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \
+ < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
+
+pre-install:
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}"
+
+post-install:
+ ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${PREFIX}/share/httpd/build
+ cd ${EGDIR} && \
+ for file in \
+ httpd.conf \
+ extra/httpd-ssl.conf; \
+ do \
+ ${AWK} ' \
+ /^Listen[ ]*80/ { \
+ print; \
+ printf "%s", "Listen 0.0.0.0:80\n"; \
+ next; \
+ } \
+ /^Listen[ ]*443/ { \
+ print; \
+ printf "%s", "Listen 0.0.0.0:443\n"; \
+ next; \
+ } \
+ { print; } \
+ ' < "$${file}" >> $${file}.new; \
+ ${MV} -f $${file}.new $${file}; \
+ done
+
+ ${LN} -sf ${SBINDIR}/envvars-std ${SBINDIR}/envvars
+
+ ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${PREFIX}/sbin
+
+ for file in ${FIX_PERMS}; do \
+ ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/sbin/$$file && \
+ ${CHMOD} ${BINMODE} ${PREFIX}/sbin/$$file; \
+ done
+
+ ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/httpd
+ ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/include/httpd
+ ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/httpd
+ ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/libexec/cgi-bin/test-cgi
+ ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/libexec/cgi-bin/printenv
+
+ for file in ${FIX_MAN_PERMS}; do \
+ ${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/${PKGMANDIR}/$$file; \
+ done
+
+.include "../../mk/bsd.pkg.mk"
diff -r 87638b80f1ab -r 9a7926615f97 www/apache22/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache22/Makefile.common Fri Dec 08 23:31:52 2006 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+
+DISTNAME= httpd-${APACHE_VERSION}
+EXTRACT_SUFX= .tar.bz2
+# When updating this version be sure to update the checksum and remove
+# any PKGREVISION for devel/apr also.
+APACHE_VERSION= 2.2.3
+APR_VERSION= 1.2.8
+MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
+ ${MASTER_SITE_APACHE:=httpd/old/} \
+ http://www.NetBSD.org/images/logos/
+MAINTAINER= tron%NetBSD.org@localhost
diff -r 87638b80f1ab -r 9a7926615f97 www/apache22/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache22/PLIST Fri Dec 08 23:31:52 2006 +0000
@@ -0,0 +1,1097 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+include/httpd/ap_compat.h
+include/httpd/ap_config.h
+include/httpd/ap_config_auto.h
+include/httpd/ap_config_layout.h
+include/httpd/ap_listen.h
+include/httpd/ap_mmn.h
+include/httpd/ap_mpm.h
+include/httpd/ap_provider.h
+include/httpd/ap_regex.h
+include/httpd/ap_regkey.h
+include/httpd/ap_release.h
+include/httpd/http_config.h
Home |
Main Index |
Thread Index |
Old Index