apache with IPv6 patch, for 1.3.26.

proxy module was disabled as the IPv6 patch for the module is broken.
This commit is contained in:
itojun 2002-06-20 07:24:17 +00:00
parent c81471d18c
commit 8cdf397ce7
4 changed files with 84 additions and 61 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.49 2001/12/26 21:20:27 jlam Exp $
# $NetBSD: Makefile,v 1.50 2002/06/20 07:24:17 itojun Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@ -7,9 +7,8 @@
# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
#
DISTNAME= apache_1.3.22
PKGNAME= apache6-1.3.22
PKGREVISION= 1
DISTNAME= apache_1.3.26
PKGNAME= apache6-1.3.26
CATEGORIES= www
MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
http://www.apache.de/dist/httpd/ \
@ -17,9 +16,10 @@ MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
sitedrivenby.gif
MASTER_SITES+= ftp://ftp.piuha.net/pub/misc/
DISTFILES+= ${IPV6_PATCH}
IPV6_PATCH= apache-1.3.22-v6-20011123.diff.gz
MASTER_SITES+= http://www.ipng.nl/
PATCHFILES+= ${IPV6_PATCH}
IPV6_PATCH= apache-1.3.26-ipv6.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= itojun@netbsd.org
HOMEPAGE= http://httpd.apache.org/
@ -30,11 +30,12 @@ CONFLICTS= apache-[0-9]* apache-*modssl-[0-9]* apache6-[0-9]*
EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz}
USE_BUILDLINK_ONLY= YES
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ${WRKSRC}/configure.v6
CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
CONFIGURE_ARGS+= --enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm
CONFIGURE_ARGS+= --enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm \
--enable-rule=INET6
CONFIGURE_ARGS+= --disable-module=proxy
CONFIGURE_ARGS+= --with-perl=${PERL5}
CONFIGURE_ARGS+= --with-port=80
CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}"
@ -68,14 +69,6 @@ BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
# Under Apache 1.3, modules can be compiled to link dynamically to the server
# using the "apxs" program. See apxs(8).
.if !defined(NOPIC)
CONFIGURE_ARGS+= --enable-module=so # requires dlopen()
CONFIGURE_ARGS+= --enable-shared=proxy
PLIST_SRC+= ${PKGDIR}/PLIST.shared
.else
CONFIGURE_ARGS+= --disable-module=proxy
.endif
PLIST_SRC+= ${PKGDIR}/PLIST
APACHE_CUSTOM_CFLAGS?= # empty
@ -115,7 +108,6 @@ RCD_SCRIPTS= apache
OWN_DIRS= /var/log/httpd
OWN_DIRS+= /var/spool/httpd
OWN_DIRS_PERMS+= /var/spool/httpd/proxy nobody nobody 0755
pre-patch:
${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
@ -125,13 +117,6 @@ post-patch:
${SED} -e "s|@INSTALL@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \
apxs.pl > apxs.pl.sed; \
${MV} apxs.pl.sed apxs.pl
for file in ${IPV6_PATCH}; do \
${GZCAT} ${_DISTDIR}/$${file} | \
${PATCH} ${PATCH_DIST_ARGS} \
|| ( ${ECHO} "Patch $${file} failed" ; exit 1 ) ; \
done
${CHMOD} +x ${CONFIGURE_SCRIPT}
cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist-
${SED} -e "s|#Listen ::|Listen ::|" \
-e "s|#Listen 0.0.0.0|Listen 0.0.0.0|" \
@ -147,9 +132,6 @@ pre-install:
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
post-install:
.if !defined(NOPIC)
cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so
.endif
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
for file in httpd.conf magic mime.types; do \
${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default \

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:12 zuntum Exp $
@comment $NetBSD: PLIST,v 1.2 2002/06/20 07:24:17 itojun Exp $
bin/dbmmanage
bin/htdigest
bin/htpasswd
@ -84,7 +84,7 @@ share/httpd/htdocs/index.html.he.iso8859-8
share/httpd/htdocs/index.html.it
share/httpd/htdocs/index.html.ja.jis
share/httpd/htdocs/index.html.kr.iso-kr
share/httpd/htdocs/index.html.lu
share/httpd/htdocs/index.html.lb.utf8
share/httpd/htdocs/index.html.nl
share/httpd/htdocs/index.html.nn
share/httpd/htdocs/index.html.no
@ -99,14 +99,16 @@ share/httpd/htdocs/index.html.ru.ucs2
share/httpd/htdocs/index.html.ru.ucs4
share/httpd/htdocs/index.html.ru.utf8
share/httpd/htdocs/index.html.se
share/httpd/htdocs/index.html.zh.Big5
share/httpd/htdocs/index.html.zh
share/httpd/htdocs/manual/LICENSE
share/httpd/htdocs/manual/bind.html.en
share/httpd/htdocs/manual/bind.html.fr
share/httpd/htdocs/manual/bind.html.html
share/httpd/htdocs/manual/bind.html.ja.jis
share/httpd/htdocs/manual/cgi_path.html.en
share/httpd/htdocs/manual/cgi_path.html.fr
share/httpd/htdocs/manual/cgi_path.html.html
share/httpd/htdocs/manual/cgi_path.html.ja.jis
share/httpd/htdocs/manual/configuring.html.en
share/httpd/htdocs/manual/configuring.html.fr
share/httpd/htdocs/manual/configuring.html.html
@ -130,6 +132,7 @@ share/httpd/htdocs/manual/handler.html.en
share/httpd/htdocs/manual/handler.html.html
share/httpd/htdocs/manual/handler.html.ja.jis
share/httpd/htdocs/manual/header.html
share/httpd/htdocs/manual/howto/auth.html
share/httpd/htdocs/manual/howto/cgi.html.en
share/httpd/htdocs/manual/howto/cgi.html.html
share/httpd/htdocs/manual/howto/cgi.html.ja.jis
@ -208,14 +211,21 @@ share/httpd/htdocs/manual/mod/header.html
share/httpd/htdocs/manual/mod/index-bytype.html.en
share/httpd/htdocs/manual/mod/index-bytype.html.fr
share/httpd/htdocs/manual/mod/index-bytype.html.html
share/httpd/htdocs/manual/mod/index-bytype.html.ja.jis
share/httpd/htdocs/manual/mod/index.html.en
share/httpd/htdocs/manual/mod/index.html.fr
share/httpd/htdocs/manual/mod/index.html.html
share/httpd/htdocs/manual/mod/index.html.ja.jis
share/httpd/htdocs/manual/mod/mod_access.html
share/httpd/htdocs/manual/mod/mod_actions.html
share/httpd/htdocs/manual/mod/mod_access.html.en
share/httpd/htdocs/manual/mod/mod_access.html.html
share/httpd/htdocs/manual/mod/mod_access.html.ja.jis
share/httpd/htdocs/manual/mod/mod_actions.html.en
share/httpd/htdocs/manual/mod/mod_actions.html.html
share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis
share/httpd/htdocs/manual/mod/mod_alias.html
share/httpd/htdocs/manual/mod/mod_asis.html
share/httpd/htdocs/manual/mod/mod_asis.html.en
share/httpd/htdocs/manual/mod/mod_asis.html.html
share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis
share/httpd/htdocs/manual/mod/mod_auth.html
share/httpd/htdocs/manual/mod/mod_auth_anon.html
share/httpd/htdocs/manual/mod/mod_auth_db.html
@ -224,10 +234,14 @@ share/httpd/htdocs/manual/mod/mod_auth_digest.html
share/httpd/htdocs/manual/mod/mod_autoindex.html
share/httpd/htdocs/manual/mod/mod_browser.html
share/httpd/htdocs/manual/mod/mod_cern_meta.html
share/httpd/htdocs/manual/mod/mod_cgi.html
share/httpd/htdocs/manual/mod/mod_cgi.html.en
share/httpd/htdocs/manual/mod/mod_cgi.html.html
share/httpd/htdocs/manual/mod/mod_cgi.html.ja.jis
share/httpd/htdocs/manual/mod/mod_cookies.html
share/httpd/htdocs/manual/mod/mod_digest.html
share/httpd/htdocs/manual/mod/mod_dir.html
share/httpd/htdocs/manual/mod/mod_dir.html.en
share/httpd/htdocs/manual/mod/mod_dir.html.html
share/httpd/htdocs/manual/mod/mod_dir.html.ja.jis
share/httpd/htdocs/manual/mod/mod_dld.html
share/httpd/htdocs/manual/mod/mod_env.html.en
share/httpd/htdocs/manual/mod/mod_env.html.html
@ -237,7 +251,9 @@ share/httpd/htdocs/manual/mod/mod_expires.html
share/httpd/htdocs/manual/mod/mod_headers.html
share/httpd/htdocs/manual/mod/mod_imap.html
share/httpd/htdocs/manual/mod/mod_include.html
share/httpd/htdocs/manual/mod/mod_info.html
share/httpd/htdocs/manual/mod/mod_info.html.en
share/httpd/htdocs/manual/mod/mod_info.html.html
share/httpd/htdocs/manual/mod/mod_info.html.ja.jis
share/httpd/htdocs/manual/mod/mod_isapi.html
share/httpd/htdocs/manual/mod/mod_log_agent.html
share/httpd/htdocs/manual/mod/mod_log_common.html
@ -256,11 +272,19 @@ share/httpd/htdocs/manual/mod/mod_rewrite.html
share/httpd/htdocs/manual/mod/mod_setenvif.html.en
share/httpd/htdocs/manual/mod/mod_setenvif.html.html
share/httpd/htdocs/manual/mod/mod_setenvif.html.ja.jis
share/httpd/htdocs/manual/mod/mod_so.html
share/httpd/htdocs/manual/mod/mod_speling.html
share/httpd/htdocs/manual/mod/mod_so.html.en
share/httpd/htdocs/manual/mod/mod_so.html.html
share/httpd/htdocs/manual/mod/mod_so.html.ja.jis
share/httpd/htdocs/manual/mod/mod_speling.html.en
share/httpd/htdocs/manual/mod/mod_speling.html.html
share/httpd/htdocs/manual/mod/mod_speling.html.ja.jis
share/httpd/htdocs/manual/mod/mod_status.html
share/httpd/htdocs/manual/mod/mod_unique_id.html
share/httpd/htdocs/manual/mod/mod_userdir.html
share/httpd/htdocs/manual/mod/mod_unique_id.html.en
share/httpd/htdocs/manual/mod/mod_unique_id.html.html
share/httpd/htdocs/manual/mod/mod_unique_id.html.ja.jis
share/httpd/htdocs/manual/mod/mod_userdir.html.en
share/httpd/htdocs/manual/mod/mod_userdir.html.html
share/httpd/htdocs/manual/mod/mod_userdir.html.ja.jis
share/httpd/htdocs/manual/mod/mod_usertrack.html
share/httpd/htdocs/manual/mod/mod_vhost_alias.html
share/httpd/htdocs/manual/mod/module-dict.html.en
@ -276,30 +300,43 @@ share/httpd/htdocs/manual/new_features_1_3.html.en
share/httpd/htdocs/manual/new_features_1_3.html.html
share/httpd/htdocs/manual/new_features_1_3.html.ja.jis
share/httpd/htdocs/manual/new_features_2_0.html
share/httpd/htdocs/manual/process-model.html
share/httpd/htdocs/manual/process-model.html.en
share/httpd/htdocs/manual/process-model.html.html
share/httpd/htdocs/manual/process-model.html.ja.jis
share/httpd/htdocs/manual/programs/ab.html
share/httpd/htdocs/manual/programs/apachectl.html
share/httpd/htdocs/manual/programs/apachectl.html.en
share/httpd/htdocs/manual/programs/apachectl.html.html
share/httpd/htdocs/manual/programs/apachectl.html.ja.jis
share/httpd/htdocs/manual/programs/apxs.html
share/httpd/htdocs/manual/programs/dbmmanage.html
share/httpd/htdocs/manual/programs/footer.html
share/httpd/htdocs/manual/programs/header.html
share/httpd/htdocs/manual/programs/htdigest.html
share/httpd/htdocs/manual/programs/htpasswd.html
share/httpd/htdocs/manual/programs/httpd.html
share/httpd/htdocs/manual/programs/htpasswd.html.en
share/httpd/htdocs/manual/programs/htpasswd.html.html
share/httpd/htdocs/manual/programs/htpasswd.html.ja.jis
share/httpd/htdocs/manual/programs/httpd.html.en
share/httpd/htdocs/manual/programs/httpd.html.html
share/httpd/htdocs/manual/programs/httpd.html.ja.jis
share/httpd/htdocs/manual/programs/index.html.en
share/httpd/htdocs/manual/programs/index.html.html
share/httpd/htdocs/manual/programs/index.html.ja.jis
share/httpd/htdocs/manual/programs/logresolve.html
share/httpd/htdocs/manual/programs/other.html
share/httpd/htdocs/manual/programs/rotatelogs.html
share/httpd/htdocs/manual/programs/suexec.html
share/httpd/htdocs/manual/programs/suexec.html.en
share/httpd/htdocs/manual/programs/suexec.html.html
share/httpd/htdocs/manual/programs/suexec.html.ja.jis
share/httpd/htdocs/manual/readme-tpf.html
share/httpd/htdocs/manual/search/manual-index.cgi
share/httpd/htdocs/manual/sections.html
share/httpd/htdocs/manual/sections.html.en
share/httpd/htdocs/manual/sections.html.html
share/httpd/htdocs/manual/sections.html.ja.jis
share/httpd/htdocs/manual/server-wide.html.en
share/httpd/htdocs/manual/server-wide.html.fr
share/httpd/htdocs/manual/server-wide.html.html
share/httpd/htdocs/manual/server-wide.html.ja.jis
share/httpd/htdocs/manual/sitemap.html
share/httpd/htdocs/manual/sourcereorg.html
share/httpd/htdocs/manual/stopping.html.en
share/httpd/htdocs/manual/stopping.html.fr
@ -314,7 +351,9 @@ share/httpd/htdocs/manual/urlmapping.html
share/httpd/htdocs/manual/vhosts/details.html
share/httpd/htdocs/manual/vhosts/details_1_2.html
share/httpd/htdocs/manual/vhosts/examples.html
share/httpd/htdocs/manual/vhosts/fd-limits.html
share/httpd/htdocs/manual/vhosts/fd-limits.html.en
share/httpd/htdocs/manual/vhosts/fd-limits.html.html
share/httpd/htdocs/manual/vhosts/fd-limits.html.ja.jis
share/httpd/htdocs/manual/vhosts/footer.html
share/httpd/htdocs/manual/vhosts/header.html
share/httpd/htdocs/manual/vhosts/host.html
@ -328,11 +367,14 @@ share/httpd/htdocs/manual/vhosts/name-based.html.html
share/httpd/htdocs/manual/vhosts/name-based.html.ja.jis
share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
share/httpd/htdocs/manual/vhosts/virtual-host.html
share/httpd/htdocs/manual/win_compiling.html
share/httpd/htdocs/manual/win_compiling.html.en
share/httpd/htdocs/manual/win_compiling.html.html
share/httpd/htdocs/manual/win_compiling.html.ja.jis
share/httpd/htdocs/manual/win_service.html.en
share/httpd/htdocs/manual/win_service.html.html
share/httpd/htdocs/manual/win_service.html.ja.jis
share/httpd/htdocs/manual/windows.html
share/httpd/htdocs/manual/windows.html.en
share/httpd/htdocs/manual/windows.html.ja.jis
share/httpd/htdocs/sitedrivenby.gif
share/httpd/icons/README
share/httpd/icons/a.gif
@ -377,6 +419,8 @@ share/httpd/icons/continued.gif
share/httpd/icons/continued.png
share/httpd/icons/dir.gif
share/httpd/icons/dir.png
share/httpd/icons/diskimg.gif
share/httpd/icons/diskimg.png
share/httpd/icons/down.gif
share/httpd/icons/down.png
share/httpd/icons/dvi.gif
@ -563,3 +607,4 @@ share/httpd/icons/world2.png
@dirrm share/examples/httpd
@dirrm include/httpd/xml
@dirrm include/httpd

View file

@ -1,4 +0,0 @@
@comment $NetBSD: PLIST.shared,v 1.1 2001/11/01 02:23:26 zuntum Exp $
lib/httpd/mod_proxy.so
lib/httpd/httpd.exp
@dirrm lib/httpd

View file

@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.11 2002/01/01 06:22:54 jlam Exp $
$NetBSD: distinfo,v 1.12 2002/06/20 07:24:18 itojun Exp $
SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e
Size (apache_1.3.22.tar.gz) = 2177983 bytes
SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f
Size (apache_1.3.26.tar.gz) = 2303147 bytes
SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
Size (sitedrivenby.gif) = 8519 bytes
SHA1 (apache-1.3.22-v6-20011123.diff.gz) = aec9c4e8b918f176b6c73e3a85cde82e21a45776
Size (apache-1.3.22-v6-20011123.diff.gz) = 53755 bytes
SHA1 (apache-1.3.26-ipv6.diff.gz) = 610bba0fd90b43834abab1f574ac4c6ebbce6989
Size (apache-1.3.26-ipv6.diff.gz) = 35421 bytes
SHA1 (patch-aa) = d8305a8a00d1d017a4e49f35329d5011c4d39ff8
SHA1 (patch-ab) = 7619dbf1cf584f9e92998fe25de0860bfbeb277e
SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f