Tue Oct 5 19:22:09 2021 UTC ()
apache24: updated to 2.4.50

Changes with Apache 2.4.50

*) SECURITY: CVE-2021-41773: Path traversal and file disclosure
   vulnerability in Apache HTTP Server 2.4.49 (cve.mitre.org)
   A flaw was found in a change made to path normalization in
   Apache HTTP Server 2.4.49. An attacker could use a path
   traversal attack to map URLs to files outside the expected
   document root.
   If files outside of the document root are not protected by
   "require all denied" these requests can succeed. Additionally
   this flaw could leak the source of interpreted files like CGI
   scripts.
   This issue is known to be exploited in the wild.
   This issue only affects Apache 2.4.49 and not earlier versions.
   Credits: This issue was reported by Ash Daulton along with the
   cPanel Security Team

*) SECURITY: CVE-2021-41524: null pointer dereference in h2 fuzzing
   (cve.mitre.org)
   While fuzzing the 2.4.49 httpd, a new null pointer dereference
   was detected during HTTP/2 request processing,
   allowing an external source to DoS the server. This requires a
   specially crafted request.
   The vulnerability was recently introduced in version 2.4.49. No
   exploit is known to the project.
   Credits: Apache httpd team would like to thank LI ZHI XIN from
   NSFocus Security Team for reporting this issue.

*) core: AP_NORMALIZE_DECODE_UNRESERVED should normalize the second dot in
   the uri-path when it's preceded by a dot.

*) mod_md: when MDMessageCmd for a 'challenge-setup:<type>:<dnsname>'
   fails (!= 0 exit), the renewal process is aborted and an error is
   reported for the MDomain. This provides scripts that distribute
   information in a cluster to abort early with bothering an ACME
   server to validate a dns name that will not work. The common
   retry logic will make another attempt in the future, as with
   other failures.
   Fixed a bug when adding private key specs to an already working
   MDomain, see <https://github.com/icing/mod_md/issues/260>.

*) mod_proxy: Handle UDS URIs with empty hostname ("unix:///...") as if they
   had no hostname ("unix:/...").

*) mod_md: fixed a bug in handling multiple parallel OCSP requests. These could
   run into an assertion which terminated (and restarted) the child process where
   the task was running. Eventually, all OCSP responses were collected, but not
   in the way that things are supposed to work.
   See also <https://bz.apache.org/bugzilla/show_bug.cgi?id=65567>.
   The bug was possibly triggered when more than one OCSP status needed updating
   at the same time. For example for several renewed certificates after a server
   reload.

*) mod_rewrite: Fix UDS ("unix:") scheme for

*) event mpm: Correctly count active child processes in parent process if
   child process dies due to MaxConnectionsPerChild.

*) mod_http2: when a server is restarted gracefully, any idle h2 worker
   threads are shut down immediately.
   Also, change OpenSSL API use for deprecations in OpenSSL 3.0.
   Adds all other, never proposed code changes to make a clean
   sync of http2 sources.

*) mod_dav: Correctly handle errors returned by dav providers on REPORT
   requests.

*) core: do not install core input/output filters on secondary
   connections.

*) core: Add ap_pre_connection() as a wrapper to ap_run_pre_connection()
   and use it to prevent that failures in running the pre_connection
   hook cause crashes afterwards.

*) mod_speling: Add CheckBasenameMatch.


(adam)
diff -r1.103 -r1.104 pkgsrc/www/apache24/Makefile
diff -r1.46 -r1.47 pkgsrc/www/apache24/distinfo

cvs diff -r1.103 -r1.104 pkgsrc/www/apache24/Makefile (switch to unified diff)

--- pkgsrc/www/apache24/Makefile 2021/09/29 19:01:26 1.103
+++ pkgsrc/www/apache24/Makefile 2021/10/05 19:22:08 1.104
@@ -1,204 +1,203 @@ @@ -1,204 +1,203 @@
1# $NetBSD: Makefile,v 1.103 2021/09/29 19:01:26 adam Exp $ 1# $NetBSD: Makefile,v 1.104 2021/10/05 19:22:08 adam Exp $
2# 2#
3# When updating this package, make sure that no strings like 3# When updating this package, make sure that no strings like
4# "PR 12345" are in the commit message. Upstream likes 4# "PR 12345" are in the commit message. Upstream likes
5# to reference their own PRs this way, but this ends up 5# to reference their own PRs this way, but this ends up
6# in NetBSD GNATS. 6# in NetBSD GNATS.
7 7
8DISTNAME= httpd-2.4.49 8DISTNAME= httpd-2.4.50
9PKGNAME= ${DISTNAME:S/httpd/apache/} 9PKGNAME= ${DISTNAME:S/httpd/apache/}
10PKGREVISION= 1 
11CATEGORIES= www 10CATEGORIES= www
12MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} 11MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/}
13MASTER_SITES+= https://archive.apache.org/dist/httpd/ 12MASTER_SITES+= https://archive.apache.org/dist/httpd/
14EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
15 14
16MAINTAINER= ryoon@NetBSD.org 15MAINTAINER= ryoon@NetBSD.org
17HOMEPAGE= https://httpd.apache.org/ 16HOMEPAGE= https://httpd.apache.org/
18COMMENT= Apache HTTP (Web) server, version 2.4 17COMMENT= Apache HTTP (Web) server, version 2.4
19LICENSE= apache-2.0 18LICENSE= apache-2.0
20 19
21BUILD_DEFS+= IPV6_READY 20BUILD_DEFS+= IPV6_READY
22BUILD_DEFS+= VARBASE 21BUILD_DEFS+= VARBASE
23 22
24USE_LIBTOOL= yes 23USE_LIBTOOL= yes
25USE_TOOLS+= pax perl pkg-config 24USE_TOOLS+= pax perl pkg-config
26GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
27CONFIGURE_ARGS+= --enable-layout=NetBSD 26CONFIGURE_ARGS+= --enable-layout=NetBSD
28CONFIGURE_ARGS+= --enable-mods-shared=all 27CONFIGURE_ARGS+= --enable-mods-shared=all
29CONFIGURE_ARGS+= --enable-so 28CONFIGURE_ARGS+= --enable-so
30CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} 29CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
31CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util} 30CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
32CONFIGURE_ARGS+= --with-port=80 31CONFIGURE_ARGS+= --with-port=80
33CONFIGURE_ENV+= perlbin=${PERL5:Q} 32CONFIGURE_ENV+= perlbin=${PERL5:Q}
34CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent 33CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
35 34
36.include "../../mk/compiler.mk" 35.include "../../mk/compiler.mk"
37 36
38CFLAGS.SunOS+= -D__EXTENSIONS__ 37CFLAGS.SunOS+= -D__EXTENSIONS__
39.if !empty(CC_VERSION:Mgcc-[5-9]*) || !empty(CC_VERSION:Mgcc-1[0-9].*) || !empty(PKGSRC_COMPILER:Mclang) 38.if !empty(CC_VERSION:Mgcc-[5-9]*) || !empty(CC_VERSION:Mgcc-1[0-9].*) || !empty(PKGSRC_COMPILER:Mclang)
40CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 39CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
41.else 40.else
42CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 41CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
43.endif 42.endif
44 43
45BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0 44BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0
46.include "../../devel/apr/buildlink3.mk" 45.include "../../devel/apr/buildlink3.mk"
47BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3 46BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3
48.include "../../devel/apr-util/buildlink3.mk" 47.include "../../devel/apr-util/buildlink3.mk"
49.include "../../devel/pcre/buildlink3.mk" 48.include "../../devel/pcre/buildlink3.mk"
50.include "../../security/openssl/buildlink3.mk" 49.include "../../security/openssl/buildlink3.mk"
51.include "../../textproc/expat/buildlink3.mk" 50.include "../../textproc/expat/buildlink3.mk"
52.include "../../mk/dlopen.buildlink3.mk" 51.include "../../mk/dlopen.buildlink3.mk"
53.include "../../mk/pthread.buildlink3.mk" 52.include "../../mk/pthread.buildlink3.mk"
54 53
55CONFIGURE_ARGS+= --enable-proxy-fdpass 54CONFIGURE_ARGS+= --enable-proxy-fdpass
56 55
57DFLT_APACHE_MODULES+= all 56DFLT_APACHE_MODULES+= all
58APACHE_MODULES?= ${DFLT_APACHE_MODULES} 57APACHE_MODULES?= ${DFLT_APACHE_MODULES}
59 58
60.include "options.mk" 59.include "options.mk"
61 60
62# LDAP support 61# LDAP support
63PLIST_VARS+= ldap 62PLIST_VARS+= ldap
64.if ${PKG_BUILD_OPTIONS.apr-util:Mldap} 63.if ${PKG_BUILD_OPTIONS.apr-util:Mldap}
65DFLT_APACHE_MODULES+= ldap authnz_ldap 64DFLT_APACHE_MODULES+= ldap authnz_ldap
66PLIST.ldap= yes 65PLIST.ldap= yes
67.endif 66.endif
68 67
69PLIST_VARS+= ssl 68PLIST_VARS+= ssl
70.if ${PKG_BUILD_OPTIONS.apr-util:Mssl} 69.if ${PKG_BUILD_OPTIONS.apr-util:Mssl}
71PLIST.ssl= yes 70PLIST.ssl= yes
72.endif 71.endif
73 72
74APACHE_USER?= www 73APACHE_USER?= www
75APACHE_GROUP?= www 74APACHE_GROUP?= www
76PKG_GROUPS= ${APACHE_GROUP} 75PKG_GROUPS= ${APACHE_GROUP}
77PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} 76PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
78PKG_GROUPS_VARS= APACHE_GROUP 77PKG_GROUPS_VARS= APACHE_GROUP
79PKG_USERS_VARS= APACHE_USER 78PKG_USERS_VARS= APACHE_USER
80 79
81PKG_SYSCONFVAR= apache 80PKG_SYSCONFVAR= apache
82PKG_SYSCONFSUBDIR= httpd 81PKG_SYSCONFSUBDIR= httpd
83EGDIR= ${PREFIX}/share/examples/httpd 82EGDIR= ${PREFIX}/share/examples/httpd
84SBINDIR= ${PREFIX}/sbin 83SBINDIR= ${PREFIX}/sbin
85CONF_FILES+= ${EGDIR}/httpd.conf ${PKG_SYSCONFDIR}/httpd.conf 84CONF_FILES+= ${EGDIR}/httpd.conf ${PKG_SYSCONFDIR}/httpd.conf
86.for f in autoindex dav default info languages manual mpm \ 85.for f in autoindex dav default info languages manual mpm \
87 multilang-errordoc ssl userdir vhosts 86 multilang-errordoc ssl userdir vhosts
88CONF_FILES+= ${EGDIR}/extra/httpd-${f}.conf \ 87CONF_FILES+= ${EGDIR}/extra/httpd-${f}.conf \
89 ${PKG_SYSCONFDIR}/httpd-${f}.conf 88 ${PKG_SYSCONFDIR}/httpd-${f}.conf
90.endfor 89.endfor
91CONF_FILES+= ${EGDIR}/magic ${PKG_SYSCONFDIR}/magic 90CONF_FILES+= ${EGDIR}/magic ${PKG_SYSCONFDIR}/magic
92CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types 91CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
93RCD_SCRIPTS= apache 92RCD_SCRIPTS= apache
94 93
95REQD_DIRS= ${PREFIX}/share/httpd 94REQD_DIRS= ${PREFIX}/share/httpd
96REQD_DIRS+= ${PREFIX}/share/httpd/htdocs 95REQD_DIRS+= ${PREFIX}/share/httpd/htdocs
97OWN_DIRS= ${VARBASE}/log/httpd 96OWN_DIRS= ${VARBASE}/log/httpd
98OWN_DIRS+= ${VARBASE}/db/httpd 97OWN_DIRS+= ${VARBASE}/db/httpd
99OWN_DIRS_PERMS+= ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 98OWN_DIRS_PERMS+= ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
100FIX_PERMS_SBIN= apachectl envvars-std 99FIX_PERMS_SBIN= apachectl envvars-std
101FIX_PERMS_BIN= apxs dbmmanage mkcert 100FIX_PERMS_BIN= apxs dbmmanage mkcert
102FIX_MAN_PERMS= man1/htdbm.1 man1/htpasswd.1 man1/htdigest.1 101FIX_MAN_PERMS= man1/htdbm.1 man1/htpasswd.1 man1/htdigest.1
103FIX_MAN_PERMS+= man1/dbmmanage.1 man8/httpd.8 man8/suexec.8 102FIX_MAN_PERMS+= man1/dbmmanage.1 man8/httpd.8 man8/suexec.8
104FIX_MAN_PERMS+= man8/rotatelogs.8 man1/logresolve.1 man1/apxs.1 103FIX_MAN_PERMS+= man8/rotatelogs.8 man1/logresolve.1 man1/apxs.1
105FIX_MAN_PERMS+= man8/apachectl.8 man1/ab.1 man1/httxt2dbm.1 104FIX_MAN_PERMS+= man8/apachectl.8 man1/ab.1 man1/httxt2dbm.1
106 105
107# Fix paths in the apache manpages. 106# Fix paths in the apache manpages.
108SUBST_CLASSES+= man 107SUBST_CLASSES+= man
109SUBST_STAGE.man= pre-configure 108SUBST_STAGE.man= pre-configure
110SUBST_MESSAGE.man= Fixing paths in man pages. 109SUBST_MESSAGE.man= Fixing paths in man pages.
111SUBST_FILES.man= docs/man/apxs.1 docs/man/htdbm.1 \ 110SUBST_FILES.man= docs/man/apxs.1 docs/man/htdbm.1 \
112 docs/man/htpasswd.1 docs/man/httpd.8 111 docs/man/htpasswd.1 docs/man/httpd.8
113SUBST_SED.man= -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},' 112SUBST_SED.man= -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
114SUBST_SED.man+= -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},' 113SUBST_SED.man+= -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},'
115SUBST_SED.man+= -e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,' 114SUBST_SED.man+= -e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,'
116SUBST_SED.man+= -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,' 115SUBST_SED.man+= -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
117 116
118SUBST_CLASSES+= paths 117SUBST_CLASSES+= paths
119SUBST_STAGE.paths= pre-configure 118SUBST_STAGE.paths= pre-configure
120SUBST_MESSAGE.paths= Fixing paths. 119SUBST_MESSAGE.paths= Fixing paths.
121SUBST_FILES.paths= config.layout Makefile.in support/apxs.in 120SUBST_FILES.paths= config.layout Makefile.in support/apxs.in
122SUBST_VARS.paths= PREFIX 121SUBST_VARS.paths= PREFIX
123SUBST_VARS.paths+= VARBASE 122SUBST_VARS.paths+= VARBASE
124SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 123SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
125SUBST_VARS.paths+= PAX PREFIX 124SUBST_VARS.paths+= PAX PREFIX
126 125
127SUBST_CLASSES+= apr-lt 126SUBST_CLASSES+= apr-lt
128SUBST_STAGE.apr-lt= post-configure 127SUBST_STAGE.apr-lt= post-configure
129SUBST_MESSAGE.apr-lt= Fixing libtool references. 128SUBST_MESSAGE.apr-lt= Fixing libtool references.
130SUBST_FILES.apr-lt= build/config_vars.mk 129SUBST_FILES.apr-lt= build/config_vars.mk
131SUBST_SED.apr-lt= -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g' 130SUBST_SED.apr-lt= -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g'
132 131
133SUBST_CLASSES+= confs 132SUBST_CLASSES+= confs
134SUBST_STAGE.confs= post-configure 133SUBST_STAGE.confs= post-configure
135SUBST_MESSAGE.confs= Fixing configuration files. 134SUBST_MESSAGE.confs= Fixing configuration files.
136SUBST_FILES.confs= docs/conf/httpd.conf 135SUBST_FILES.confs= docs/conf/httpd.conf
137SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf 136SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf
138SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g" 137SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"
139SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" 138SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g"
140SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" 139SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g"
141SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g' 140SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g'
142SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g' 141SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g'
143SUBST_SED.confs+= -e 's|^Listen \(.*\)|Listen 0.0.0.0:\1|g' 142SUBST_SED.confs+= -e 's|^Listen \(.*\)|Listen 0.0.0.0:\1|g'
144 143
145# abs_srcdir in config_vars.mk is used during install so needs to reference 144# abs_srcdir in config_vars.mk is used during install so needs to reference
146# the work dir path, and by other packages such as ap2-fastcgi after install, 145# the work dir path, and by other packages such as ap2-fastcgi after install,
147# so we fix after install to reference the installed path 146# so we fix after install to reference the installed path
148SUBST_CLASSES+= abs_srcdir 147SUBST_CLASSES+= abs_srcdir
149SUBST_STAGE.abs_srcdir= post-install 148SUBST_STAGE.abs_srcdir= post-install
150SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir 149SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir
151SUBST_FILES.abs_srcdir= ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk 150SUBST_FILES.abs_srcdir= ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk
152SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|' 151SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|'
153 152
154#REPLACE_PERL= docs/cgi-examples/printenv 153#REPLACE_PERL= docs/cgi-examples/printenv
155 154
156.include "../../devel/zlib/buildlink3.mk" 155.include "../../devel/zlib/buildlink3.mk"
157CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} 156CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
158CONFIGURE_ARGS+= --with-z=${BUILDLINK_PREFIX.zlib} 157CONFIGURE_ARGS+= --with-z=${BUILDLINK_PREFIX.zlib}
159 158
160post-extract: 159post-extract:
161 ${TOUCH} ${WRKSRC}/build/libtool 160 ${TOUCH} ${WRKSRC}/build/libtool
162 ${ECHO} "" >> ${WRKSRC}/docs/conf/extra/httpd-languages.conf.in 161 ${ECHO} "" >> ${WRKSRC}/docs/conf/extra/httpd-languages.conf.in
163 162
164post-build: 163post-build:
165 ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \ 164 ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \
166 < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert 165 < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
167 166
168INSTALL_TARGET= install-conf install 167INSTALL_TARGET= install-conf install
169INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}" 168INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}"
170 169
171post-install: 170post-install:
172 ${LN} -sf ${PREFIX}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build 171 ${LN} -sf ${PREFIX}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
173 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars 172 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
174 173
175 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/bin 174 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/bin
176 175
177.for file in ${FIX_PERMS_SBIN} 176.for file in ${FIX_PERMS_SBIN}
178 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/${file} 177 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/sbin/${file}
179 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/${file} 178 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/sbin/${file}
180.endfor 179.endfor
181 180
182.for file in ${FIX_PERMS_BIN} 181.for file in ${FIX_PERMS_BIN}
183 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/bin/${file} 182 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/bin/${file}
184 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${file} 183 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${file}
185.endfor 184.endfor
186 185
187 ${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd 186 ${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/share/httpd
188 ${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd 187 ${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/include/httpd
189 ${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd 188 ${CHOWN} -RP ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/lib/httpd
190 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi 189 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi
191 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv 190 ${CHOWN} ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv
192 191
193.for file in ${FIX_MAN_PERMS} 192.for file in ${FIX_MAN_PERMS}
194 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/${file} 193 ${CHOWN} ${MANOWN}:${MANGRP} ${DESTDIR}${PREFIX}/${PKGMANDIR}/${file}
195.endfor 194.endfor
196 195
197 ${CHMOD} a-x ${DESTDIR}${PREFIX}/sbin/envvars-std 196 ${CHMOD} a-x ${DESTDIR}${PREFIX}/sbin/envvars-std
198.if exists(${DESTDIR}${PREFIX}/sbin/suexec) 197.if exists(${DESTDIR}${PREFIX}/sbin/suexec)
199 ${CHMOD} a-w ${DESTDIR}${PREFIX}/sbin/suexec 198 ${CHMOD} a-w ${DESTDIR}${PREFIX}/sbin/suexec
200.endif 199.endif
201 200
202.include "../../mk/pthread.buildlink3.mk" 201.include "../../mk/pthread.buildlink3.mk"
203.include "../../devel/readline/buildlink3.mk" 202.include "../../devel/readline/buildlink3.mk"
204.include "../../mk/bsd.pkg.mk" 203.include "../../mk/bsd.pkg.mk"

cvs diff -r1.46 -r1.47 pkgsrc/www/apache24/distinfo (switch to unified diff)

--- pkgsrc/www/apache24/distinfo 2021/09/17 12:49:57 1.46
+++ pkgsrc/www/apache24/distinfo 2021/10/05 19:22:08 1.47
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.46 2021/09/17 12:49:57 adam Exp $ 1$NetBSD: distinfo,v 1.47 2021/10/05 19:22:08 adam Exp $
2 2
3SHA1 (httpd-2.4.49.tar.bz2) = 17e8efc1b178ce677202d71678e380459594f697 3SHA1 (httpd-2.4.50.tar.bz2) = 560cea1589d107aa06ae7eabf144316b00338141
4RMD160 (httpd-2.4.49.tar.bz2) = 73c3e94bdb0da77c833590334a4ac288d782424c 4RMD160 (httpd-2.4.50.tar.bz2) = 5f93e67fccb703318115b921d670d12ec81ad3c8
5SHA512 (httpd-2.4.49.tar.bz2) = 418e277232cf30a81d02b8554e31aaae6433bbea842bdb81e47a609469395cc4891183fb6ee02bd669edb2392c2007869b19da29f5998b8fd5c7d3142db310dd 5SHA512 (httpd-2.4.50.tar.bz2) = b1afbaf44e503b822ff2b443881dcb44a93aa55d496f88ae399a2e7def05f78590f266a16da1f2c0aac88e463b76fba20843b1e20a102e76c8269de6fae3e158
6Size (httpd-2.4.49.tar.bz2) = 7199599 bytes 6Size (httpd-2.4.50.tar.bz2) = 7653174 bytes
7SHA1 (patch-aa) = 9a66685f1d2e4710ab464beda98cbaad632aebf9 7SHA1 (patch-aa) = 9a66685f1d2e4710ab464beda98cbaad632aebf9
8SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 8SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
9SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d 9SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d
10SHA1 (patch-ad) = 4ba4a9c812951f533fa316e5dbf17eaab5494157 10SHA1 (patch-ad) = 4ba4a9c812951f533fa316e5dbf17eaab5494157
11SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903 11SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903
12SHA1 (patch-ag) = 50c7f0fab1cb90ac573f1c47f2d37f9c2a6247e1 12SHA1 (patch-ag) = 50c7f0fab1cb90ac573f1c47f2d37f9c2a6247e1
13SHA1 (patch-ai) = d3870e46e41adc97c3fce86f9ffd224502ad6b0c 13SHA1 (patch-ai) = d3870e46e41adc97c3fce86f9ffd224502ad6b0c
14SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 14SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911
15SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777 15SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777
16SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df 16SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
17SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96 17SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96
18SHA1 (patch-modules_filters_mod_substitute.c) = 730af0342b78de04fe51b7dcc3ed057b2b0c3a54 18SHA1 (patch-modules_filters_mod_substitute.c) = 730af0342b78de04fe51b7dcc3ed057b2b0c3a54