Sun Apr 22 19:08:03 2012 UTC ()
patch for CVE-2012-0883 taken from the Apache SVN
bump pkgrev


(spz)
diff -r1.79 -r1.80 pkgsrc/www/apache22/Makefile
diff -r1.50 -r1.51 pkgsrc/www/apache22/distinfo
diff -r0 -r1.1 pkgsrc/www/apache22/patches/patch-support_envvars-std.in
cvs diff -r1.79 -r1.80 pkgsrc/www/apache22/Attic/Makefile (switch to unified diff)

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

--- pkgsrc/www/apache22/Attic/distinfo 2012/02/01 19:53:21 1.50
+++ pkgsrc/www/apache22/Attic/distinfo 2012/04/22 19:08:03 1.51
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.50 2012/02/01 19:53:21 tron Exp $ 1$NetBSD: distinfo,v 1.51 2012/04/22 19:08:03 spz Exp $
2 2
3SHA1 (httpd-2.2.22.tar.bz2) = 766cd0843050a8dfb781e48b976f3ba6ebcf8696 3SHA1 (httpd-2.2.22.tar.bz2) = 766cd0843050a8dfb781e48b976f3ba6ebcf8696
4RMD160 (httpd-2.2.22.tar.bz2) = 237a26a7759e7e1af175900d598e25fb082a4eb9 4RMD160 (httpd-2.2.22.tar.bz2) = 237a26a7759e7e1af175900d598e25fb082a4eb9
5Size (httpd-2.2.22.tar.bz2) = 5378934 bytes 5Size (httpd-2.2.22.tar.bz2) = 5378934 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) = 580950dbf0154ba1c93f5c58eae766c7d6c0c00c 11SHA1 (patch-af) = 580950dbf0154ba1c93f5c58eae766c7d6c0c00c
12SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 12SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
13SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312 13SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312
14SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1 14SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1
15SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 15SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
16SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4 16SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4
17SHA1 (patch-lock.c) = 770ca03f1cb4421879bd5baa5a7c30cc91acb6e1 17SHA1 (patch-lock.c) = 770ca03f1cb4421879bd5baa5a7c30cc91acb6e1
18SHA1 (patch-repos.c) = 0e0361b91d4b0fe6c7c55a12fdfd2e6aacc710e1 18SHA1 (patch-repos.c) = 0e0361b91d4b0fe6c7c55a12fdfd2e6aacc710e1
 19SHA1 (patch-support_envvars-std.in) = 03e4989e104f4a1902a9135649d603f3e8d53d4c
File Added: pkgsrc/www/apache22/patches/Attic/patch-support_envvars-std.in
$NetBSD: patch-support_envvars-std.in,v 1.1 2012/04/22 19:08:03 spz Exp $

http://svn.apache.org/viewvc?view=revision&revision=1296428 :

Fix insecure handling of LD_LIBRARY_PATH that could lead to the
current working directory to be searched for DSOs

CVE-2012-0883

--- support/envvars-std.in.orig	2006-07-12 03:38:44.000000000 +0000
+++ support/envvars-std.in
@@ -18,7 +18,11 @@
 #
 # This file is generated from envvars-std.in
 #
-@SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
+if test "x$@SHLIBPATH_VAR@" != "x" ; then
+  @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
+else
+  @SHLIBPATH_VAR@="@exp_libdir@"
+fi
 export @SHLIBPATH_VAR@
 #
 @OS_SPECIFIC_VARS@