pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/apache24 Import apache-2.4.1 as www/apache24.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8c9210dc9bf
branches:  trunk
changeset: 602410:a8c9210dc9bf
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Apr 13 18:50:48 2012 +0000

description:
Import apache-2.4.1 as www/apache24.

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.

This package tracks 2.4.x release.

diffstat:

 www/apache24/DESCR            |     7 +
 www/apache24/Makefile         |   211 ++++++
 www/apache24/PLIST            |  1409 +++++++++++++++++++++++++++++++++++++++++
 www/apache24/buildlink3.mk    |    27 +
 www/apache24/distinfo         |    15 +
 www/apache24/files/apache.sh  |    57 +
 www/apache24/files/mkcert.sh  |   914 ++++++++++++++++++++++++++
 www/apache24/options.mk       |    59 +
 www/apache24/patches/patch-aa |   146 ++++
 www/apache24/patches/patch-ab |    15 +
 www/apache24/patches/patch-ac |    12 +
 www/apache24/patches/patch-ad |    31 +
 www/apache24/patches/patch-ae |    59 +
 www/apache24/patches/patch-ag |    16 +
 www/apache24/patches/patch-ai |    19 +
 www/apache24/patches/patch-al |    31 +
 www/apache24/patches/patch-am |    13 +
 www/apache24/patches/patch-aw |    15 +
 18 files changed, 3056 insertions(+), 0 deletions(-)

diffs (truncated from 3128 to 300 lines):

diff -r 3ec33eb9b00f -r a8c9210dc9bf www/apache24/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache24/DESCR        Fri Apr 13 18:50:48 2012 +0000
@@ -0,0 +1,7 @@
+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.
+
+This package tracks 2.4.x release.
diff -r 3ec33eb9b00f -r a8c9210dc9bf www/apache24/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache24/Makefile     Fri Apr 13 18:50:48 2012 +0000
@@ -0,0 +1,211 @@
+# $NetBSD: Makefile,v 1.1.1.1 2012/04/13 18:50:48 ryoon Exp $
+#
+
+DISTNAME=      httpd-2.4.1
+PKGNAME=       ${DISTNAME:S/httpd/apache/}
+CATEGORIES=    www
+MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/} \
+               http://archive.apache.org/dist/httpd/ \
+               http://archive.eu.apache.org/dist/httpd/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    ryoon%NetBSD.org@localhost
+HOMEPAGE=      http://httpd.apache.org/
+COMMENT=       Apache HTTP (Web) server, version 2.4
+LICENSE=       apache-2.0
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+BUILD_DEFS+=   IPV6_READY
+BUILD_DEFS+=   VARBASE
+BUILD_DEFS+=   APACHE_CUSTOM_CFLAGS
+
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pax perl pkg-config
+
+CONFIGURE_ENV+=                perlbin=${PERL5:Q}
+CONFIGURE_ENV+=                ac_cv_path_RSYNC=/nonexistent
+CONFIGURE_ENV+=                CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
+
+CONFIGURE_ARGS+=       --enable-layout=NetBSD
+CONFIGURE_ARGS+=       --with-port=80
+CONFIGURE_ARGS+=       --enable-so
+CONFIGURE_ARGS+=       --enable-mods-shared=all
+
+CONFIGURE_ARGS+=       --with-apr=${BUILDLINK_PREFIX.apr}
+CONFIGURE_ARGS+=       --with-apr-util=${BUILDLINK_PREFIX.apr-util}
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../devel/apr/buildlink3.mk"
+.include "../../devel/apr-util/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+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-actions
+CONFIGURE_ARGS+=       --disable-userdir
+CONFIGURE_ARGS+=       --disable-alias
+
+DFLT_APACHE_MODULES+=  all
+APACHE_MODULES?=       ${DFLT_APACHE_MODULES}
+
+.include "options.mk"
+
+FIND_PREFIX:=  APRDIR=apr
+.include "../../mk/find-prefix.mk"
+
+# LDAP support
+PLIST_VARS+=           ldap
+.if exists(${APRDIR}/lib/apr-util-1/apr_ldap.la) || !empty(PKG_OPTIONS:Mapache-shared-modules)
+DFLT_APACHE_MODULES+=  ldap authnz_ldap
+PLIST.ldap=            yes
+.endif
+
+APACHE_USER?=          www
+APACHE_GROUP?=         www
+PKG_GROUPS=            ${APACHE_GROUP}
+PKG_USERS=             ${APACHE_USER}:${APACHE_GROUP}
+PKG_GROUPS_VARS=       APACHE_GROUP
+PKG_USERS_VARS=                APACHE_USER
+
+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_SBIN=                apachectl envvars-std
+FIX_PERMS_BIN=         apxs dbmmanage 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 man1/logresolve.1 man1/apxs.1
+FIX_MAN_PERMS+=                man8/apachectl.8 man1/ab.1 man1/httxt2dbm.1
+
+# Fix paths in the apache manpages.
+SUBST_CLASSES+=                man
+SUBST_STAGE.man=       post-patch
+SUBST_MESSAGE.man=     Fixing paths in man pages.
+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_MESSAGE.paths=   Fixing paths.
+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@|${PREFIX}|g"
+
+SUBST_CLASSES+=                apr-lt
+SUBST_STAGE.apr-lt=    post-configure
+SUBST_MESSAGE.apr-lt=  Fixing libtool references.
+SUBST_FILES.apr-lt=    build/config_vars.mk
+SUBST_SED.apr-lt=      -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g'
+
+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'
+SUBST_SED.confs+=      -e 's|^Listen \(.*\)|Listen 0.0.0.0:\1|g'
+
+# abs_srcdir in config_vars.mk is used during install so needs to reference
+# the work dir path, and by other packages such as ap2-fastcgi after install,
+# so we fix after install to reference the installed path
+SUBST_CLASSES+=                        abs_srcdir
+SUBST_STAGE.abs_srcdir=                post-install
+SUBST_MESSAGE.abs_srcdir=      Fixing abs_srcdir
+SUBST_FILES.abs_srcdir=                ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk
+SUBST_SED.abs_srcdir=          -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|'
+
+REPLACE_PERL=          docs/cgi-examples/printenv
+
+.if !empty(PKG_OPTIONS:Mapache-shared-modules)
+.  include "../../devel/zlib/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-z=${BUILDLINK_PREFIX.zlib}
+.endif
+
+post-extract:
+       ${TOUCH} ${WRKSRC}/build/libtool
+       ${ECHO} "" >> ${WRKSRC}/docs/conf/extra/httpd-languages.conf.in
+
+post-build:
+       ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g"                 \
+               < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
+
+INSTALL_TARGET=                install-conf install
+INSTALL_MAKE_FLAGS+=   sysconfdir="${EGDIR}"
+
+post-install:
+       ${LN} -sf ${APRDIR}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
+       ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
+
+       ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/bin
+
+.for file in ${FIX_PERMS_SBIN}
+       ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/${file}
+       ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/${file}
+.endfor
+
+.for file in ${FIX_PERMS_BIN}
+       ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/bin/${file}
+       ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${file}
+.endfor
+
+       ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
+       ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
+       ${CHOWN} -h -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
+       ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
+       ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
+
+.for file in ${FIX_MAN_PERMS}
+       ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/${file}
+.endfor
+
+       ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std
+.if exists(${DESTDIR}${PREFIX}/sbin/suexec)
+       ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec
+.endif
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 3ec33eb9b00f -r a8c9210dc9bf www/apache24/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache24/PLIST        Fri Apr 13 18:50:48 2012 +0000
@@ -0,0 +1,1409 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+bin/ab
+bin/apxs
+bin/dbmmanage
+bin/htdbm
+bin/htdigest
+bin/htpasswd
+bin/httxt2dbm
+bin/logresolve
+bin/mkcert
+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_expr.h
+include/httpd/ap_hooks.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/ap_slotmem.h
+include/httpd/ap_socache.h
+include/httpd/apache_noprobes.h
+include/httpd/heartbeat.h
+include/httpd/http_config.h
+include/httpd/http_connection.h
+include/httpd/http_core.h
+include/httpd/http_log.h
+include/httpd/http_main.h
+include/httpd/http_protocol.h
+include/httpd/http_request.h
+include/httpd/http_vhost.h
+include/httpd/httpd.h
+include/httpd/mod_auth.h
+include/httpd/mod_cache.h
+include/httpd/mod_cgi.h
+include/httpd/mod_core.h
+include/httpd/mod_dav.h
+include/httpd/mod_dbd.h
+include/httpd/mod_include.h
+include/httpd/mod_log_config.h
+include/httpd/mod_proxy.h
+include/httpd/mod_request.h
+include/httpd/mod_rewrite.h
+include/httpd/mod_session.h
+include/httpd/mod_so.h
+include/httpd/mod_ssl.h
+include/httpd/mod_status.h
+include/httpd/mod_unixd.h
+include/httpd/mod_watchdog.h
+include/httpd/mpm_common.h
+include/httpd/os.h
+include/httpd/scoreboard.h
+include/httpd/unixd.h
+include/httpd/util_cfgtree.h
+include/httpd/util_charset.h
+include/httpd/util_cookies.h
+include/httpd/util_ebcdic.h
+include/httpd/util_filter.h
+include/httpd/util_ldap.h
+include/httpd/util_md5.h
+include/httpd/util_mutex.h
+include/httpd/util_script.h
+include/httpd/util_time.h
+include/httpd/util_varbuf.h
+include/httpd/util_xml.h
+lib/httpd/httpd.exp



Home | Main Index | Thread Index | Old Index