Tue Jul 27 17:25:35 2010 UTC ()
Pullup ticket 3187 - requested by tron
security update

Revisions pulled up:
- pkgsrc/www/apache22/Makefile		1.61
- pkgsrc/www/apache22/distinfo		1.34

Files deleted:
pkgsrc/www/apache22/patches/patch-af

-------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Mon Jul 26 21:38:52 UTC 2010

   Modified Files:
           pkgsrc/www/apache22: Makefile distinfo
   Removed Files:
           pkgsrc/www/apache22/patches: patch-af

   Log Message:
   Update "apache22" package to version 2.2.16. Changes since version 2.2.15:
   - SECURITY: CVE-2010-1452 (cve.mitre.org)
     mod_dav, mod_cache: Fix Handling of requests without a path segment.
     PR: 49246 [Mark Drayton, Jeff Trawick]
   - SECURITY: CVE-2010-2068 (cve.mitre.org)
     mod_proxy_ajp, mod_proxy_http, mod_reqtimeout: Fix timeout detection
     for platforms Windows, Netware and OS2.  PR: 49417. [Rainer Jung]
   - core: Filter init functions are now run strictly once per request
     before handler invocation.  The init functions are no longer run
     for connection filters.  PR 49328.  [Joe Orton]
   - mod_filter: enable it to act on non-200 responses.
     PR 48377 [Nick Kew]
   - mod_ldap: LDAP caching was suppressed (and ldap-status handler returns
     title page only) when any mod_ldap directives were used in VirtualHost
     context.  [Eric Covener]
   - mod_ssl: Fix segfault at startup if proxy client certs are shared
     across multiple vhosts.  PR 39915.  [Joe Orton]
   - mod_proxy_http: Log the port of the remote server in various messages.
     PR 48812. [Igor Gali?? <i galic brainsware org>]
   - apxs: Fix -A and -a options to ignore whitespace in httpd.conf
     [Philip M. Gollucci]
   - mod_dir: add FallbackResource directive, to enable admin to specify
     an action to happen when a URL maps to no file, without resorting
     to ErrorDocument or mod_rewrite.  PR 47184 [Nick Kew]
   - mod_rewrite: Allow to set environment variables without explicitely
     giving a value. [Rainer Jung]

   To generate a diff of this commit:
   cvs rdiff -u -r1.60 -r1.61 pkgsrc/www/apache22/Makefile
   cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/apache22/distinfo
   cvs rdiff -u -r1.3 -r0 pkgsrc/www/apache22/patches/patch-af


(spz)
diff -r1.59 -r1.59.2.1 pkgsrc/www/apache22/Makefile
diff -r1.33 -r1.33.2.1 pkgsrc/www/apache22/distinfo
diff -r1.3 -r0 pkgsrc/www/apache22/patches/patch-af
cvs diff -r1.59 -r1.59.2.1 pkgsrc/www/apache22/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/apache22/Attic/Makefile 2010/06/12 10:40:26 1.59
+++ pkgsrc/www/apache22/Attic/Makefile 2010/07/27 17:25:35 1.59.2.1
@@ -1,263 +1,262 @@ @@ -1,263 +1,262 @@
1# $NetBSD: Makefile,v 1.59 2010/06/12 10:40:26 tron Exp $ 1# $NetBSD: Makefile,v 1.59.2.1 2010/07/27 17:25:35 spz Exp $
2 2
3DISTNAME= httpd-2.2.15 3DISTNAME= httpd-2.2.16
4PKGREVISION= 3 
5PKGNAME= ${DISTNAME:S/httpd/apache/} 4PKGNAME= ${DISTNAME:S/httpd/apache/}
6CATEGORIES= www 5CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 6MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
8 http://archive.apache.org/dist/httpd/ \ 7 http://archive.apache.org/dist/httpd/ \
9 http://archive.eu.apache.org/dist/httpd/ 8 http://archive.eu.apache.org/dist/httpd/
10EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
11 10
12MAINTAINER= tron@NetBSD.org 11MAINTAINER= tron@NetBSD.org
13HOMEPAGE= http://httpd.apache.org/ 12HOMEPAGE= http://httpd.apache.org/
14COMMENT= Apache HTTP (Web) server, version 2.2 13COMMENT= Apache HTTP (Web) server, version 2.2
15LICENSE= apache-2.0 14LICENSE= apache-2.0
16 15
17PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
18 17
19BUILD_DEFS+= IPV6_READY 18BUILD_DEFS+= IPV6_READY
20BUILD_DEFS+= VARBASE 19BUILD_DEFS+= VARBASE
21 20
22USE_TOOLS+= pax perl perl:run pkg-config 21USE_TOOLS+= pax perl perl:run pkg-config
23USE_LIBTOOL= yes 22USE_LIBTOOL= yes
24GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --enable-layout=NetBSD 24CONFIGURE_ARGS+= --enable-layout=NetBSD
26CONFIGURE_ARGS+= --with-port=80 25CONFIGURE_ARGS+= --with-port=80
27CONFIGURE_ARGS+= --enable-so 26CONFIGURE_ARGS+= --enable-so
28CONFIGURE_ENV+= perlbin=${PERL5:Q} 27CONFIGURE_ENV+= perlbin=${PERL5:Q}
29CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent 28CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
30CONFIGURE_ARGS+= CFLAGS=${APACHE_CUSTOM_CFLAGS:Q} 29CONFIGURE_ARGS+= CFLAGS=${APACHE_CUSTOM_CFLAGS:Q}
31 30
32BUILD_DEFS+= APACHE_CUSTOM_CFLAGS 31BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
33 32
34# Apache Portable Runtime library configure options 33# Apache Portable Runtime library configure options
35CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} 34CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
36CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util} 35CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
37 36
38CHECK_INTERPRETER_SKIP+= lib/httpd/httpd.exp 37CHECK_INTERPRETER_SKIP+= lib/httpd/httpd.exp
39CHECK_PORTABILITY_SKIP+= srclib/pcre/* \ 38CHECK_PORTABILITY_SKIP+= srclib/pcre/* \
40 srclib/apr-util/* \ 39 srclib/apr-util/* \
41 srclib/apr/* 40 srclib/apr/*
42 41
43# the following must be set before bsd.prefs.mk in order to make += work 42# the following must be set before bsd.prefs.mk in order to make += work
44# in mk.conf; however, it isn't expanded until referenced, so we can 43# in mk.conf; however, it isn't expanded until referenced, so we can
45# define DFLT_APACHE_MODULES later 44# define DFLT_APACHE_MODULES later
46# 45#
47APACHE_MODULES?= ${DFLT_APACHE_MODULES} 46APACHE_MODULES?= ${DFLT_APACHE_MODULES}
48 47
49.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
50.include "../../devel/apr/buildlink3.mk" 49.include "../../devel/apr/buildlink3.mk"
51.include "../../devel/apr-util/buildlink3.mk" 50.include "../../devel/apr-util/buildlink3.mk"
52.include "../../textproc/expat/buildlink3.mk" 51.include "../../textproc/expat/buildlink3.mk"
53.include "../../mk/dlopen.buildlink3.mk" 52.include "../../mk/dlopen.buildlink3.mk"
54 53
55CONFIGURE_ARGS+= --disable-include 54CONFIGURE_ARGS+= --disable-include
56CONFIGURE_ARGS+= --disable-log-config 55CONFIGURE_ARGS+= --disable-log-config
57CONFIGURE_ARGS+= --disable-env 56CONFIGURE_ARGS+= --disable-env
58CONFIGURE_ARGS+= --disable-mime 57CONFIGURE_ARGS+= --disable-mime
59CONFIGURE_ARGS+= --disable-setenvif 58CONFIGURE_ARGS+= --disable-setenvif
60CONFIGURE_ARGS+= --disable-status 59CONFIGURE_ARGS+= --disable-status
61CONFIGURE_ARGS+= --disable-autoindex 60CONFIGURE_ARGS+= --disable-autoindex
62CONFIGURE_ARGS+= --disable-asis 61CONFIGURE_ARGS+= --disable-asis
63CONFIGURE_ARGS+= --disable-cgi 62CONFIGURE_ARGS+= --disable-cgi
64CONFIGURE_ARGS+= --disable-negotiation 63CONFIGURE_ARGS+= --disable-negotiation
65CONFIGURE_ARGS+= --disable-dir 64CONFIGURE_ARGS+= --disable-dir
66CONFIGURE_ARGS+= --disable-actions 65CONFIGURE_ARGS+= --disable-actions
67CONFIGURE_ARGS+= --disable-userdir 66CONFIGURE_ARGS+= --disable-userdir
68CONFIGURE_ARGS+= --disable-alias 67CONFIGURE_ARGS+= --disable-alias
69 68
70DFLT_APACHE_MODULES= all 69DFLT_APACHE_MODULES= all
71DFLT_APACHE_MODULES+= proxy proxy_connect proxy_ftp proxy_http 70DFLT_APACHE_MODULES+= proxy proxy_connect proxy_ftp proxy_http
72DFLT_APACHE_MODULES+= ssl deflate access auth authn_alias 71DFLT_APACHE_MODULES+= ssl deflate access auth authn_alias
73DFLT_APACHE_MODULES+= include log_config env mime setenvif 72DFLT_APACHE_MODULES+= include log_config env mime setenvif
74DFLT_APACHE_MODULES+= status autoindex asis cgi negotiation dir imap 73DFLT_APACHE_MODULES+= status autoindex asis cgi negotiation dir imap
75DFLT_APACHE_MODULES+= actions userdir alias isapi file_cache 74DFLT_APACHE_MODULES+= actions userdir alias isapi file_cache
76DFLT_APACHE_MODULES+= cache disk_cache mem_cache bucketeer echo 75DFLT_APACHE_MODULES+= cache disk_cache mem_cache bucketeer echo
77DFLT_APACHE_MODULES+= example case_filter case_filter_in 76DFLT_APACHE_MODULES+= example case_filter case_filter_in
78DFLT_APACHE_MODULES+= charset_lite 77DFLT_APACHE_MODULES+= charset_lite
79DFLT_APACHE_MODULES+= cgid dav_lock proxy_ajp proxy_balancer 78DFLT_APACHE_MODULES+= cgid dav_lock proxy_ajp proxy_balancer
80 79
81PLIST_SRC+= ${PKGDIR}/PLIST 80PLIST_SRC+= ${PKGDIR}/PLIST
82 81
83.include "options.mk" 82.include "options.mk"
84 83
85# LDAP support 84# LDAP support
86PLIST_VARS+= ldap 85PLIST_VARS+= ldap
87.if !empty(PKG_BUILD_OPTIONS.apr-util:Mldap) 86.if !empty(PKG_BUILD_OPTIONS.apr-util:Mldap)
88DFLT_APACHE_MODULES+= ldap authnz_ldap 87DFLT_APACHE_MODULES+= ldap authnz_ldap
89. if !empty(PKG_OPTIONS:Mapache-shared-modules) 88. if !empty(PKG_OPTIONS:Mapache-shared-modules)
90PLIST.ldap= yes 89PLIST.ldap= yes
91. endif 90. endif
92.endif 91.endif
93 92
94APACHE_USER?= www 93APACHE_USER?= www
95APACHE_GROUP?= www 94APACHE_GROUP?= www
96PKG_GROUPS= ${APACHE_GROUP} 95PKG_GROUPS= ${APACHE_GROUP}
97PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} 96PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
98PKG_GROUPS_VARS+= APACHE_GROUP 97PKG_GROUPS_VARS+= APACHE_GROUP
99PKG_USERS_VARS+= APACHE_USER 98PKG_USERS_VARS+= APACHE_USER
100 99
101PKG_SYSCONFVAR= apache 100PKG_SYSCONFVAR= apache
102PKG_SYSCONFSUBDIR?= httpd 101PKG_SYSCONFSUBDIR?= httpd
103EGDIR= ${PREFIX}/share/examples/httpd 102EGDIR= ${PREFIX}/share/examples/httpd
104SBINDIR= ${PREFIX}/sbin 103SBINDIR= ${PREFIX}/sbin
105CONF_FILES+= ${EGDIR}/httpd.conf ${PKG_SYSCONFDIR}/httpd.conf 104CONF_FILES+= ${EGDIR}/httpd.conf ${PKG_SYSCONFDIR}/httpd.conf
106.for f in autoindex dav default info languages manual mpm \ 105.for f in autoindex dav default info languages manual mpm \
107 multilang-errordoc ssl userdir vhosts 106 multilang-errordoc ssl userdir vhosts
108CONF_FILES+= ${EGDIR}/extra/httpd-${f}.conf \ 107CONF_FILES+= ${EGDIR}/extra/httpd-${f}.conf \
109 ${PKG_SYSCONFDIR}/httpd-${f}.conf 108 ${PKG_SYSCONFDIR}/httpd-${f}.conf
110.endfor 109.endfor
111CONF_FILES+= ${EGDIR}/magic ${PKG_SYSCONFDIR}/magic 110CONF_FILES+= ${EGDIR}/magic ${PKG_SYSCONFDIR}/magic
112CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types 111CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
113RCD_SCRIPTS= apache 112RCD_SCRIPTS= apache
114 113
115REQD_DIRS= ${PREFIX}/share/httpd 114REQD_DIRS= ${PREFIX}/share/httpd
116REQD_DIRS+= ${PREFIX}/share/httpd/htdocs 115REQD_DIRS+= ${PREFIX}/share/httpd/htdocs
117OWN_DIRS= ${VARBASE}/log/httpd 116OWN_DIRS= ${VARBASE}/log/httpd
118OWN_DIRS+= ${VARBASE}/db/httpd 117OWN_DIRS+= ${VARBASE}/db/httpd
119OWN_DIRS_PERMS+= ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 118OWN_DIRS_PERMS+= ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
120FIX_PERMS= apachectl apxs dbmmanage envvars-std mkcert 119FIX_PERMS= apachectl apxs dbmmanage envvars-std mkcert
121FIX_MAN_PERMS= man1/htdbm.1 man1/htpasswd.1 man1/htdigest.1 120FIX_MAN_PERMS= man1/htdbm.1 man1/htpasswd.1 man1/htdigest.1
122FIX_MAN_PERMS+= man1/dbmmanage.1 man8/httpd.8 man8/suexec.8 121FIX_MAN_PERMS+= man1/dbmmanage.1 man8/httpd.8 man8/suexec.8
123FIX_MAN_PERMS+= man8/rotatelogs.8 man8/logresolve.8 man8/apxs.8 122FIX_MAN_PERMS+= man8/rotatelogs.8 man8/logresolve.8 man8/apxs.8
124FIX_MAN_PERMS+= man8/apachectl.8 man8/ab.8 123FIX_MAN_PERMS+= man8/apachectl.8 man8/ab.8
125 124
126# Fix paths in the apache manpages. 125# Fix paths in the apache manpages.
127SUBST_CLASSES+= man 126SUBST_CLASSES+= man
128SUBST_STAGE.man= post-patch 127SUBST_STAGE.man= post-patch
129SUBST_FILES.man= docs/man/*.1 docs/man/*.8 128SUBST_FILES.man= docs/man/*.1 docs/man/*.8
130SUBST_SED.man= -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},' 129SUBST_SED.man= -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
131SUBST_SED.man+= -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},' 130SUBST_SED.man+= -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},'
132SUBST_SED.man+= -e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,' 131SUBST_SED.man+= -e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,'
133SUBST_SED.man+= -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,' 132SUBST_SED.man+= -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
134 133
135SUBST_CLASSES+= paths 134SUBST_CLASSES+= paths
136SUBST_STAGE.paths= pre-configure 135SUBST_STAGE.paths= pre-configure
137SUBST_FILES.paths= config.layout Makefile.in support/apxs.in 136SUBST_FILES.paths= config.layout Makefile.in support/apxs.in
138SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g" 137SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g"
139SUBST_SED.paths+= -e "s|@VARBASE@|${VARBASE}|g" 138SUBST_SED.paths+= -e "s|@VARBASE@|${VARBASE}|g"
140SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 139SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
141SUBST_SED.paths+= -e "s|@PAX@|${PAX}|g" 140SUBST_SED.paths+= -e "s|@PAX@|${PAX}|g"
142SUBST_SED.paths+= -e "s|@LOCALBASE@|${LOCALBASE}|g" 141SUBST_SED.paths+= -e "s|@LOCALBASE@|${LOCALBASE}|g"
143SUBST_MESSAGE.paths= Fixing paths. 142SUBST_MESSAGE.paths= Fixing paths.
144 143
145SUBST_CLASSES+= apr-lt 144SUBST_CLASSES+= apr-lt
146SUBST_STAGE.apr-lt= post-configure 145SUBST_STAGE.apr-lt= post-configure
147SUBST_FILES.apr-lt= build/config_vars.mk 146SUBST_FILES.apr-lt= build/config_vars.mk
148SUBST_SED.apr-lt= -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g' 147SUBST_SED.apr-lt= -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g'
149SUBST_MESSAGE.apr-lt= Fixing libtool references. 148SUBST_MESSAGE.apr-lt= Fixing libtool references.
150 149
151SUBST_CLASSES+= confs 150SUBST_CLASSES+= confs
152SUBST_STAGE.confs= post-configure 151SUBST_STAGE.confs= post-configure
153SUBST_MESSAGE.confs= Fixing configuration files. 152SUBST_MESSAGE.confs= Fixing configuration files.
154SUBST_FILES.confs= docs/conf/httpd.conf 153SUBST_FILES.confs= docs/conf/httpd.conf
155SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf 154SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf
156SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g" 155SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"
157SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" 156SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g"
158SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" 157SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g"
159SUBST_SED.confs+= -e "s|logs/|${VARBASE}/log/httpd/|g" 158SUBST_SED.confs+= -e "s|logs/|${VARBASE}/log/httpd/|g"
160SUBST_SED.confs+= -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g' 159SUBST_SED.confs+= -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g'
161SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g' 160SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g'
162SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g' 161SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g'
163 162
164# abs_srcdir in config_vars.mk is used during install so needs to reference 163# abs_srcdir in config_vars.mk is used during install so needs to reference
165# the work dir path, and by other packages such as ap2-fastcgi after install, 164# the work dir path, and by other packages such as ap2-fastcgi after install,
166# so we fix after install to reference the installed path 165# so we fix after install to reference the installed path
167SUBST_CLASSES+= abs_srcdir 166SUBST_CLASSES+= abs_srcdir
168SUBST_STAGE.abs_srcdir= post-install 167SUBST_STAGE.abs_srcdir= post-install
169SUBST_FILES.abs_srcdir= ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk 168SUBST_FILES.abs_srcdir= ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk
170SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|' 169SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|'
171SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir 170SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir
172 171
173REPLACE_PERL= docs/cgi-examples/printenv 172REPLACE_PERL= docs/cgi-examples/printenv
174 173
175# Add dependencies for the modules that will be built. For each module 174# Add dependencies for the modules that will be built. For each module
176# ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace 175# ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace
177# separated list of dependencies or buildlink3.mk files needed to build 176# separated list of dependencies or buildlink3.mk files needed to build
178# ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of 177# ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of
179# configure script options for ap_mod. 178# configure script options for ap_mod.
180# 179#
181AP_DEPENDS.ssl= ../../security/openssl/buildlink3.mk 180AP_DEPENDS.ssl= ../../security/openssl/buildlink3.mk
182AP_DEPENDS.deflate= ../../devel/zlib/buildlink3.mk 181AP_DEPENDS.deflate= ../../devel/zlib/buildlink3.mk
183 182
184AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl} 183AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl}
185AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib} 184AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib}
186 185
187#.if ${APACHE_MODULES} == "all-shared" 186#.if ${APACHE_MODULES} == "all-shared"
188.if !empty(PKG_OPTIONS:Mapache-shared-modules) 187.if !empty(PKG_OPTIONS:Mapache-shared-modules)
189.include "${AP_DEPENDS.ssl}" 188.include "${AP_DEPENDS.ssl}"
190.include "${AP_DEPENDS.deflate}" 189.include "${AP_DEPENDS.deflate}"
191CONFIGURE_ARGS+= ${AP_CFG_ARGS.ssl} ${AP_CFG_ARGS.deflate} 190CONFIGURE_ARGS+= ${AP_CFG_ARGS.ssl} ${AP_CFG_ARGS.deflate}
192.else 191.else
193.for ap_mod in ${APACHE_MODULES} 192.for ap_mod in ${APACHE_MODULES}
194. if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod}) 193. if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod})
195. for ap_depend in ${AP_DEPENDS.${ap_mod}} 194. for ap_depend in ${AP_DEPENDS.${ap_mod}}
196. if exists(${ap_depend}) 195. if exists(${ap_depend})
197. include "${ap_depend}" 196. include "${ap_depend}"
198. else 197. else
199DEPENDS+= ${ap_depend} 198DEPENDS+= ${ap_depend}
200. endif 199. endif
201. endfor 200. endfor
202. endif 201. endif
203. if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod}) 202. if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod})
204CONFIGURE_ARGS+= ${AP_CFG_ARGS.${ap_mod}} 203CONFIGURE_ARGS+= ${AP_CFG_ARGS.${ap_mod}}
205. endif 204. endif
206.endfor 205.endfor
207.endif 206.endif
208 207
209post-extract: 208post-extract:
210 ${TOUCH} ${WRKSRC}/build/libtool 209 ${TOUCH} ${WRKSRC}/build/libtool
211 ${ECHO} "" >> ${WRKSRC}/docs/conf/extra/httpd-languages.conf.in 210 ${ECHO} "" >> ${WRKSRC}/docs/conf/extra/httpd-languages.conf.in
212 211
213post-build: 212post-build:
214 ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \ 213 ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \
215 < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert 214 < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
216 215
217INSTALL_TARGET= install-conf install 216INSTALL_TARGET= install-conf install
218INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}" 217INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}"
219 218
220post-install: 219post-install:
221 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build 220 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
222 cd ${DESTDIR}${EGDIR} && \ 221 cd ${DESTDIR}${EGDIR} && \
223 for file in \ 222 for file in \
224 httpd.conf \ 223 httpd.conf \
225 extra/httpd-ssl.conf; \ 224 extra/httpd-ssl.conf; \
226 do \ 225 do \
227 ${AWK} ' \ 226 ${AWK} ' \
228 /^Listen[ ]*80/ { \ 227 /^Listen[ ]*80/ { \
229 printf "%s", "Listen 0.0.0.0:80\n"; \ 228 printf "%s", "Listen 0.0.0.0:80\n"; \
230 next; \ 229 next; \
231 } \ 230 } \
232 /^Listen[ ]*443/ { \ 231 /^Listen[ ]*443/ { \
233 printf "%s", "Listen 0.0.0.0:443\n"; \ 232 printf "%s", "Listen 0.0.0.0:443\n"; \
234 next; \ 233 next; \
235 } \ 234 } \
236 { print; } \ 235 { print; } \
237 ' < "$${file}" >> $${file}.new; \ 236 ' < "$${file}" >> $${file}.new; \
238 ${MV} -f $${file}.new $${file}; \ 237 ${MV} -f $${file}.new $${file}; \
239 done 238 done
240 239
241 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars 240 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
242 241
243 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin 242 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin
244 243
245 for file in ${FIX_PERMS}; do \ 244 for file in ${FIX_PERMS}; do \
246 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \ 245 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/$$file && \
247 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \ 246 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/$$file; \
248 done 247 done
249 248
250 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd 249 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
251 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd 250 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
252 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd 251 ${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
253 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi 252 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
254 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv 253 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
255 254
256 for file in ${FIX_MAN_PERMS}; do \ 255 for file in ${FIX_MAN_PERMS}; do \
257 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \ 256 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/$$file; \
258 done 257 done
259 258
260 ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std 259 ${CHMOD} -x ${DESTDIR}${PREFIX}/sbin/envvars-std
261 ${TEST} ! -f ${DESTDIR}${PREFIX}/sbin/suexec || ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec 260 ${TEST} ! -f ${DESTDIR}${PREFIX}/sbin/suexec || ${CHMOD} -w ${DESTDIR}${PREFIX}/sbin/suexec
262 261
263.include "../../mk/bsd.pkg.mk" 262.include "../../mk/bsd.pkg.mk"
cvs diff -r1.33 -r1.33.2.1 pkgsrc/www/apache22/Attic/distinfo (switch to unified diff)

--- pkgsrc/www/apache22/Attic/distinfo 2010/06/12 10:40:26 1.33
+++ pkgsrc/www/apache22/Attic/distinfo 2010/07/27 17:25:35 1.33.2.1
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1$NetBSD: distinfo,v 1.33 2010/06/12 10:40:26 tron Exp $ 1$NetBSD: distinfo,v 1.33.2.1 2010/07/27 17:25:35 spz Exp $
2 2
3SHA1 (httpd-2.2.15.tar.bz2) = 5f0e973839ed2e38a4d03adba109ef5ce3381bc2 3SHA1 (httpd-2.2.16.tar.bz2) = ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9
4RMD160 (httpd-2.2.15.tar.bz2) = e5c5da1fdf86a6b0501f6c8e97ccb1982e81cfdf 4RMD160 (httpd-2.2.16.tar.bz2) = 2e6d7d1dae40905be7fdd793140f62cf58112095
5Size (httpd-2.2.15.tar.bz2) = 4959582 bytes 5Size (httpd-2.2.16.tar.bz2) = 4775545 bytes
6SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7 6SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7
7SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150 7SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150
8SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad 8SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
9SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13 9SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
10SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913 10SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913
11SHA1 (patch-af) = c3051544406326297161f36ff3f499395630dc05 
12SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 11SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
13SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312 12SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312
14SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1 13SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1
15SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 14SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
16SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4 15SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4
File Deleted: pkgsrc/www/apache22/patches/Attic/patch-af