Date: Sun, 20 Jul 2014 22:34:14 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r362382 - in branches/2014Q3/www/apache24: . files Message-ID: <201407202234.s6KMYEsT018306@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Jul 20 22:34:13 2014 New Revision: 362382 URL: http://svnweb.freebsd.org/changeset/ports/362382 QAT: https://qat.redports.org/buildarchive/r362382/ Log: MFH: r361314 - strip - remove obsolete apache-*-2.2.* conflict - add modules.d to EXAMPLESDIR - always install DOC (remove Makefile hack) - bump PORREVISION - sort pkg-plist MFH: r361316 - revert conflict (apache22 has MPM sub ports) MFH: r362041 Use modern LIB_DEPENDS on non default options Submitted by: ohauer MFH: r362371 - security update to release 2.4.10 - add OPTION for new mod_authnz_fcgi module - s/libluajit.so/libluajit-5.1.so/ (there is no libluajit.so) - backport for mod_lua: Don't quote values in cookies Make IE happy again [#56734] http://svn.apache.org/viewvc?view=revision&revision=1611744 - disable sanity check on demand [1] Release Notes: http://www.apache.org/dist/httpd/CHANGES_2.4.10 Approved by: portmgr (erwin@) PR: 191398 [1] Submitted by: Robert Schulze <rs@bytecamp.net> Security: 4364e1f1-0f44-11e4-b090-20cf30e32f6d CVE-2014-0117 CVE-2014-3523 CVE-2014-0226 CVE-2014-0118 CVE-2014-0231 Added: branches/2014Q3/www/apache24/files/patch-r1611744-modules__lua__lua_request.c - copied unchanged from r362371, head/www/apache24/files/patch-r1611744-modules__lua__lua_request.c Deleted: branches/2014Q3/www/apache24/files/patch-mod_authn_socache.c Modified: branches/2014Q3/www/apache24/Makefile branches/2014Q3/www/apache24/Makefile.options branches/2014Q3/www/apache24/Makefile.options.desc branches/2014Q3/www/apache24/distinfo branches/2014Q3/www/apache24/files/apache24.in branches/2014Q3/www/apache24/files/patch-Makefile.in branches/2014Q3/www/apache24/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/apache24/Makefile ============================================================================== --- branches/2014Q3/www/apache24/Makefile Sun Jul 20 22:22:10 2014 (r362381) +++ branches/2014Q3/www/apache24/Makefile Sun Jul 20 22:34:13 2014 (r362382) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.9 -PORTREVISION= 3 +PORTVERSION= 2.4.10 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -16,7 +15,7 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/tex libpcre.so:${PORTSDIR}/devel/pcre CONFLICTS_INSTALL= caudium14-1.* \ - apache-*-2.2.* apache22-* + apache-*-2.2.* apache22-* USE_APACHE= common24 USES= tar:bzip2 iconv perl5 libtool cpe @@ -53,12 +52,12 @@ IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped LDAP_CONFIGURE_ON= --enable-ldap=shared -LUAJIT_LIB_DEPENDS= luajit:${PORTSDIR}/lang/luajit +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit LUA_CONFIGURE_WITH= lua LUA_USES= lua SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE} -SOCACHE_DC_LIB_DEPENDS= distcache:${PORTSDIR}/security/distcache +SOCACHE_DC_LIB_DEPENDS= libdistcache.so:${PORTSDIR}/security/distcache # Note: # OpenSSL version (base/ports) depends how devel/apr1 was build @@ -72,10 +71,6 @@ SSL_USE= OPENSSL=yes ETC_SUBDIRS= Includes envvars.d extra modules.d -.if ! ${PORT_OPTIONS:MDOCS} -MAKE_ENV+= NOPORTDOCS=yes -.endif - APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config @@ -156,6 +151,14 @@ post-install: @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}/${ETCDIR}/modules.d/ +# place for module configuration samples + @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/modules.d + ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}/${EXAMPLESDIR}/modules.d + +# suppress warning for non binary files + -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* \ + ${STAGEDIR}${PREFIX}/bin/* \ + ${STAGEDIR}${PREFIX}/libexec/apache24/*.so 2>/dev/null .if ${PORT_OPTIONS:MLOG_FORENSIC} @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin Modified: branches/2014Q3/www/apache24/Makefile.options ============================================================================== --- branches/2014Q3/www/apache24/Makefile.options Sun Jul 20 22:22:10 2014 (r362381) +++ branches/2014Q3/www/apache24/Makefile.options Sun Jul 20 22:34:13 2014 (r362382) @@ -57,7 +57,7 @@ MOST_ENABLED_MODULES= \ VERSION VHOST_ALIAS MOST_DISABLED_MODULES:= \ - AUTHNZ_LDAP LDAP CHARSET_LITE DATA DAV_LOCK DIALUP IDENT LOG_FORENSIC \ + AUTHNZ_LDAP AUTHNZ_FCGI LDAP CHARSET_LITE DATA DAV_LOCK DIALUP IDENT LOG_FORENSIC \ LUA REFLECTOR SLOTMEM_PLAIN SLOTMEM_SHM SOCACHE_DC SUEXEC USERTRACK \ XML2ENC WATCHDOG ${HEARTBEAT_MODULES} ${EXAMPLE_MODULES} ${DEV_MODULES} Modified: branches/2014Q3/www/apache24/Makefile.options.desc ============================================================================== --- branches/2014Q3/www/apache24/Makefile.options.desc Sun Jul 20 22:22:10 2014 (r362381) +++ branches/2014Q3/www/apache24/Makefile.options.desc Sun Jul 20 22:34:13 2014 (r362382) @@ -42,6 +42,7 @@ ACTIONS_DESC= Action triggering on req ALIAS_DESC= Mapping of requests to different filesystem parts ALLOWMETHODS_DESC= Easily restrict what HTTP methods can be used on the server ASIS_DESC= Sends files that contain their own HTTP headers +AUTHNZ_FCGI_DESC= Allows a FastCGI authorizer to handle the check_authn hook AUTHNZ_LDAP_DESC= LDAP based authentication AUTHN_ANON_DESC= Anonymous user authentication control AUTHN_CORE_DESC= Core authentication module Modified: branches/2014Q3/www/apache24/distinfo ============================================================================== --- branches/2014Q3/www/apache24/distinfo Sun Jul 20 22:22:10 2014 (r362381) +++ branches/2014Q3/www/apache24/distinfo Sun Jul 20 22:34:13 2014 (r362382) @@ -1,2 +1,2 @@ -SHA256 (apache24/httpd-2.4.9.tar.bz2) = f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603 -SIZE (apache24/httpd-2.4.9.tar.bz2) = 4994460 +SHA256 (apache24/httpd-2.4.10.tar.bz2) = 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a +SIZE (apache24/httpd-2.4.10.tar.bz2) = 5031834 Modified: branches/2014Q3/www/apache24/files/apache24.in ============================================================================== --- branches/2014Q3/www/apache24/files/apache24.in Sun Jul 20 22:22:10 2014 (r362381) +++ branches/2014Q3/www/apache24/files/apache24.in Sun Jul 20 22:34:13 2014 (r362382) @@ -23,6 +23,7 @@ # Set to yes to check for accf_http kernel # module on start up and load if not loaded. # apache24_fib (str): Set an altered default network view for apache +# apache24_configcheck_disable (bool): Set to "YES" to disable sanity check on startup . /etc/rc.subr @@ -46,6 +47,7 @@ envvars="%%PREFIX%%/sbin/envvars" [ -z "$apache24limits_enable" ] && apache24limits_enable="NO" [ -z "$apache24limits_args" ] && apache24limits_args="-e -C daemon" [ -z "$apache24_http_accept_enable" ] && apache24_http_accept_enable="NO" +[ -z "$apache24_configcheck_disable" ] && apache24_configcheck_disable="NO" apache24_accf() { @@ -75,6 +77,7 @@ if [ -n "$2" ]; then eval apache24limits_enable="\${apache24limits_${profile}_enable:-${apache24limits_enable}}" eval apache24limits_args="\${apache24limits_${profile}_args:-${apache24limits_args}}" eval apache24_fib="\${apache24_${profile}_fib:-${apache24_fib}}" + eval apache24_configcheck_disable="\${apache24_${profile}_configcheck_disable:-${apache24_configcheck_disable}}" eval command="\${apache24_${profile}_command:-${command}}" eval pidfile="\${apache24_${profile}_pidfile:-${pidfile}}" eval apache24_envvars="\${apache24_${profile}_envvars:-${envvars}}" @@ -123,10 +126,14 @@ if [ "${1}" != "stop" ] ; then \ apache24_accf fi +if checkyesno apache24_configcheck_disable +then + unset restart_precmd + unset reload_precmd +fi + apache24_requirepidfile() { - apache24_checkconfig - if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then echo "${name} not running? (check $pidfile)." exit 1 @@ -147,6 +154,11 @@ apache24_checkconfig() apache24_graceful() { apache24_requirepidfile + if ! checkyesno apache24_configcheck_disable + then + apache24_checkconfig + fi + echo "Performing a graceful restart" eval ${command} ${apache24_flags} -k graceful } @@ -154,13 +166,21 @@ apache24_graceful() { apache24_gracefulstop() { apache24_requirepidfile + if ! checkyesno apache24_configcheck_disable + then + apache24_checkconfig + fi + echo "Performing a graceful stop" eval ${command} ${apache24_flags} -k graceful-stop } apache24_precmd() { - apache24_checkconfig + if ! checkyesno apache24_configcheck_disable + then + apache24_checkconfig + fi if checkyesno apache24limits_enable then Modified: branches/2014Q3/www/apache24/files/patch-Makefile.in ============================================================================== --- branches/2014Q3/www/apache24/files/patch-Makefile.in Sun Jul 20 22:22:10 2014 (r362381) +++ branches/2014Q3/www/apache24/files/patch-Makefile.in Sun Jul 20 22:34:13 2014 (r362382) @@ -1,5 +1,5 @@ --- ./Makefile.in.orig 2012-12-17 12:50:41.000000000 +0100 -+++ ./Makefile.in 2013-10-27 15:15:14.000000000 +0100 ++++ ./Makefile.in 2014-07-08 06:27:38.000000000 +0200 @@ -32,12 +32,10 @@ install-conf: @echo Installing configuration files @@ -91,16 +91,8 @@ install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -224,19 +196,17 @@ - done - - install-man: -- @echo Installing man pages and online manual -+ @echo Installing man pages - @test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir) - @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 - @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 -- @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) +@@ -231,12 +203,7 @@ + @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 - @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ @@ -109,11 +101,7 @@ - cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \ - cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi -+.if !defined(NOPORTDOCS) -+ @echo Installing online manual -+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) -+ cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); -+.endif ++ cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir) install-suexec: @if test -f $(builddir)/support/suexec; then \ Copied: branches/2014Q3/www/apache24/files/patch-r1611744-modules__lua__lua_request.c (from r362371, head/www/apache24/files/patch-r1611744-modules__lua__lua_request.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/apache24/files/patch-r1611744-modules__lua__lua_request.c Sun Jul 20 22:34:13 2014 (r362382, copy of r362371, head/www/apache24/files/patch-r1611744-modules__lua__lua_request.c) @@ -0,0 +1,22 @@ +backport for mod_lua: Don't quote values in cookies; Make IE happy again [#56734] +http://svn.apache.org/viewvc?view=revision&revision=1611744 + + +--- ./modules/lua/lua_request.c.orig 2014-07-20 10:48:19.000000000 +0200 ++++ ./modules/lua/lua_request.c 2014-07-20 10:48:46.000000000 +0200 +@@ -2086,13 +2086,13 @@ + if (expires > 0) { + rv = apr_rfc822_date(cdate, apr_time_from_sec(expires)); + if (rv == APR_SUCCESS) { +- strexpires = apr_psprintf(r->pool, "Expires=\"%s\";", cdate); ++ strexpires = apr_psprintf(r->pool, "Expires=%s;", cdate); + } + } + + /* Create path segment */ + if (path != NULL && strlen(path) > 0) { +- strpath = apr_psprintf(r->pool, "Path=\"%s\";", path); ++ strpath = apr_psprintf(r->pool, "Path=%s;", path); + } + + /* Create domain segment */ Modified: branches/2014Q3/www/apache24/pkg-plist ============================================================================== --- branches/2014Q3/www/apache24/pkg-plist Sun Jul 20 22:22:10 2014 (r362381) +++ branches/2014Q3/www/apache24/pkg-plist Sun Jul 20 22:34:13 2014 (r362382) @@ -78,6 +78,7 @@ libexec/apache24/httpd.exp %%MOD_ALIAS%%libexec/apache24/mod_alias.so %%MOD_ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so %%MOD_ASIS%%libexec/apache24/mod_asis.so +%%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so %%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so %%MOD_AUTHN_ANON%%libexec/apache24/mod_authn_anon.so %%MOD_AUTHN_CORE%%libexec/apache24/mod_authn_core.so @@ -279,6 +280,7 @@ sbin/split-logfile @unexec if cmp -s %D/%%ETCDIR%%/mime.types %D/%%EXAMPLESDIR%%/mime.types; then rm -f %D/%%ETCDIR%%/mime.types; fi %%EXAMPLESDIR%%/mime.types @exec [ -f %D/%%ETCDIR%%/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types %D/%%ETCDIR%%/mime.types +%%EXAMPLESDIR%%/modules.d/README_modules.d %%WWWDIR%%/cgi-bin/printenv %%WWWDIR%%/cgi-bin/printenv.vbs %%WWWDIR%%/cgi-bin/printenv.wsf @@ -545,22 +547,23 @@ sbin/split-logfile %%WWWDIR%%/icons/world2.gif %%WWWDIR%%/icons/world2.png %%WWWDIR%%/icons/xml.png -@dirrm %%WWWDIR%%/icons/small -@dirrm %%WWWDIR%%/icons -@dirrm %%WWWDIR%%/error/include -@dirrm %%WWWDIR%%/error -@dirrmtry %%WWWDIR%%/data -@dirrmtry %%WWWDIR%%/cgi-bin -@dirrmtry %%WWWDIR%% -@dirrm %%EXAMPLESDIR%%/extra -@dirrm %%EXAMPLESDIR%% -@dirrm %%DATADIR%%/build -@dirrm %%DATADIR%% -@dirrmtry libexec/apache24 -@dirrmtry include/apache24 @unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true -@dirrmtry %%ETCDIR%%/modules.d -@dirrmtry %%ETCDIR%%/extra -@dirrmtry %%ETCDIR%%/envvars.d @dirrmtry %%ETCDIR%%/Includes +@dirrmtry %%ETCDIR%%/envvars.d +@dirrmtry %%ETCDIR%%/extra +@dirrmtry %%ETCDIR%%/modules.d @dirrmtry %%ETCDIR%% +@dirrmtry include/apache24 +@dirrmtry libexec/apache24 +@dirrm %%DATADIR%%/build +@dirrm %%DATADIR%% +@dirrm %%EXAMPLESDIR%%/extra +@dirrm %%EXAMPLESDIR%%/modules.d +@dirrm %%EXAMPLESDIR%% +@dirrmtry %%WWWDIR%%/cgi-bin +@dirrmtry %%WWWDIR%%/data +@dirrm %%WWWDIR%%/error/include +@dirrm %%WWWDIR%%/error +@dirrm %%WWWDIR%%/icons/small +@dirrm %%WWWDIR%%/icons +@dirrmtry %%WWWDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407202234.s6KMYEsT018306>