From owner-freebsd-apache@FreeBSD.ORG Sun Sep 2 08:15:18 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34A611065670; Sun, 2 Sep 2012 08:15:18 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65]) by mx1.freebsd.org (Postfix) with ESMTP id E3ACB8FC0A; Sun, 2 Sep 2012 08:15:17 +0000 (UTC) Received: from [192.168.0.100] (cde1100.uni.vrs [192.168.0.100]) (Authenticated sender: ohauer) by p578be941.dip0.t-ipconnect.de (Postfix) with ESMTPSA id 58C6F20491; Sun, 2 Sep 2012 10:15:11 +0200 (CEST) Message-ID: <50431591.5040406@FreeBSD.org> Date: Sun, 02 Sep 2012 10:15:13 +0200 From: Olli Hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: Waitman Gobble References: <1346543324.15749@da3m0n8t3r.com> In-Reply-To: <1346543324.15749@da3m0n8t3r.com> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: FreeBSD Ports , "apache@FreeBSD.org" Subject: Re: apache22 options NG rewrite testers wanted X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 08:15:18 -0000 On 2012-09-02 01:48, Waitman Gobble wrote: >>> > > OK, I can do that... BUT those three options were 'already' selected when i did >> > the test... >> > >> > snip ... >> > >> > >> > So it seems more and more the reported issue is a local one. > > I agree. So you *don't* need testing on my 9 machine, right? Right, Thanks for your support! -- Regards, olli From owner-freebsd-apache@FreeBSD.ORG Sun Sep 2 13:51:37 2012 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2EBC6106566C; Sun, 2 Sep 2012 13:51:37 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 01F5C8FC17; Sun, 2 Sep 2012 13:51:37 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q82Dpa4o098814; Sun, 2 Sep 2012 13:51:36 GMT (envelope-from ohauer@freefall.freebsd.org) Received: (from ohauer@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q82DpafS098797; Sun, 2 Sep 2012 13:51:36 GMT (envelope-from ohauer) Date: Sun, 2 Sep 2012 13:51:36 GMT Message-Id: <201209021351.q82DpafS098797@freefall.freebsd.org> To: ohauer@FreeBSD.org, portmgr@FreeBSD.org, apache@FreeBSD.org From: ohauer@FreeBSD.org Cc: Subject: Re: ports/165143: [exp-run] [patch] devel/apr: CVE / Update / exp-run / shlib bump X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 13:51:37 -0000 Synopsis: [exp-run] [patch] devel/apr: CVE / Update / exp-run / shlib bump Responsible-Changed-From-To: portmgr->apache Responsible-Changed-By: ohauer Responsible-Changed-When: Sun Sep 2 13:49:52 UTC 2012 Responsible-Changed-Why: exp-run was done, transfer back to apache http://www.freebsd.org/cgi/query-pr.cgi?pr=165143 From owner-freebsd-apache@FreeBSD.ORG Sun Sep 2 14:40:14 2012 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 467011065670 for ; Sun, 2 Sep 2012 14:40:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2FB008FC12 for ; Sun, 2 Sep 2012 14:40:14 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q82EeE1U086464 for ; Sun, 2 Sep 2012 14:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q82EeEPb086449; Sun, 2 Sep 2012 14:40:14 GMT (envelope-from gnats) Date: Sun, 2 Sep 2012 14:40:14 GMT Message-Id: <201209021440.q82EeEPb086449@freefall.freebsd.org> To: apache@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/165143: commit references a PR X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 14:40:14 -0000 The following reply was made to PR ports/165143; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/165143: commit references a PR Date: Sun, 2 Sep 2012 14:32:11 +0000 (UTC) Author: ohauer Date: Sun Sep 2 14:31:58 2012 New Revision: 303550 URL: http://svn.freebsd.org/changeset/ports/303550 Log: devel/apr1 [1] - update APR to 1.4.6 - update APR-util to 1.4.1 - remove PKGNAMESUFFIX'es www/apache-(event|itk|peruser|worker)-mpm - adopt new Makefile header, adjust PKGNAMESUFFIX in apache22 masterport PKGNAME match now LATEST_LINK www/apache22 [2]-[6] - rewrite for options NG - PORTNAME s|apache|apache22| - remove APR APR-util specific otions, will be checked now with help of apr/u-1-config Mk/bsd.apache.mk - rewrite for options NG - remove no longer needet make targets (show-categories, make-options-list) [1] PR: 165143 [2]-[6] PR: 130479 PR: 153406 PR: 158565 PR: 168769 PR: 167965 with hat apache@ Added: head/www/apache22/files/extra-patch-server__config.c (contents, props changed) head/www/apache22/files/extra-patch-suexec_userdir (contents, props changed) head/www/apache22/files/mpm-itk-limits (contents, props changed) Deleted: head/devel/apr1/files/patch-apr_ldap_rebind.c Modified: head/Mk/bsd.apache.mk (contents, props changed) head/devel/apr1/Makefile (contents, props changed) head/devel/apr1/distinfo (contents, props changed) head/devel/apr1/files/patch-apr_hints.m4 (contents, props changed) head/devel/apr1/pkg-plist (contents, props changed) head/www/apache22-event-mpm/Makefile head/www/apache22-itk-mpm/Makefile head/www/apache22-peruser-mpm/Makefile head/www/apache22-worker-mpm/Makefile head/www/apache22/Makefile head/www/apache22/Makefile.doc (contents, props changed) head/www/apache22/Makefile.modules head/www/apache22/Makefile.options head/www/apache22/pkg-plist (contents, props changed) Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Sun Sep 2 14:16:18 2012 (r303549) +++ head/Mk/bsd.apache.mk Sun Sep 2 14:31:58 2012 (r303550) @@ -116,14 +116,6 @@ IGNORE= ${_ERROR_MSG} Illegal use of USE # =============================================================== .if defined(AP_PORT_IS_SERVER) # MFC TODO: remove this check -# used only in apache22-peruser-mpm, remved in rev. 253708 -# http://svnweb.freebsd.org/ports?view=revision&revision=253708 -# For slave ports: -.if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR} -IGNORE= Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync ${PORTVERSION} != ${SLAVE_DESIGNED_FOR} -.endif - -# MFC TODO: remove this check # used only by www/cakephp* ports .if defined(SLAVE_PORT_MODULES) DEFAULT_MODULES_CATEGORIES+= SLAVE_PORT @@ -139,23 +131,12 @@ DEFAULT_MODULES+= ${${category}_MODULE AVAILABLE_MODULES+= ${${category}_MODULES} .endfor -# == start convert param to UPPERCASE -# detect lowercase params in make.conf, users should them to UPPERCASE -# In near future we will throw an IGNORE message -#_ERROR_DLCM= ... detected (make.conf), please convert apache releated params to UPPERCASE -.if defined(WITH_MODULES) && ${WITH_MODULES:M[a-z]*} -#IGNNORE= lowercase WITH_MODULES= ${_ERROR_DLCM} -WITH_MODULES:=${WITH_MODULES:U} -.endif -.if defined(WITHOUT_MODULES) && ${WITHOUT_MODULES:M[a-z]*} -#IGNORE= lowercase WITHOUT_MODULES= ${_ERROR_DLCM} -WITHOUT_MODULES:=${WITHOUT_MODULES:U} -.endif +# detect invalid lowercase params in make.conf +# keep this check until end of 2012 .if defined(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M[a-z]*} -#IGNORE= lowercase WITH_STATIC_MODULES= ${_ERROR_DLCM} -WITH_STATIC_MODULES:=${WITH_STATIC_MODULES:U} +IGNORE= lowercase WITH_STATIC_MODULES="${WITH_STATIC_MODULES}"\ + detected (make.conf), they shoud be UPPERCASE .endif -# == end convert param to UPPERCASE # Setting "@comment " as default. .for module in ${AVAILABLE_MODULES:O} @@ -169,40 +150,38 @@ _DISABLE_MODULES+= --disable-${module:L CONFIGURE_ARGS+= ${_DISABLE_MODULES:O:u} .endif -.if ( defined(OPTIONS) || defined(OPTIONS_DEFINE) ) && !(make(make-options-list)) +# OPTIONS handling .for module in ${AVAILABLE_MODULES} -. if defined(WITH_${module}) +. if ${PORT_OPTIONS:M${module}} _APACHE_MODULES+= ${module} -. endif -. if defined(WITHOUT_${module}) +. else WITHOUT_MODULES+= ${module} . endif .endfor -.endif .if !defined(WITH_STATIC_APACHE) -. if ${USE_APACHE:Mcommon2*} != "" # FYI #DYNAMIC_MODULES= so CONFIGURE_ARGS+= --enable-so -. endif .else -. if ${USE_APACHE:Mcommon2*} != "" CONFIGURE_ARGS+= --disable-so -. endif WITH_ALL_STATIC_MODULES= yes .endif -.if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES) -. if ${USE_APACHE:Mcommon2*} != "" +.if ${PORT_OPTIONS:MSUEXEC} _APACHE_MODULES+= ${SUEXEC_MODULES} SUEXEC_CONFARGS= with-suexec -. endif -# From now we're defaulting to apache 2.* +# SUEXEC_DOCROOT should exist SUEXEC_DOCROOT?= ${PREFIX}/www/data +#SUEXEC_DOCROOT?= ${WWWDIR} SUEXEC_USERDIR?= public_html +# avoid duplicate search paths +.if ${LOCALBASE} == ${PREFIX} +SUEXEC_SAFEPATH?= ${LOCALBASE}/bin:/usr/bin:/bin +.else SUEXEC_SAFEPATH?= ${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin +.endif SUEXEC_LOGFILE?= /var/log/httpd-suexec.log SUEXEC_UIDMIN?= 1000 SUEXEC_GIDMIN?= 1000 @@ -213,10 +192,8 @@ CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-c --${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \ --${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \ --${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \ - --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" -. if ${USE_APACHE:Mcommon2*} != "" -CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec" -. endif + --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \ + --${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec" . if defined(WITH_SUEXEC_UMASK) CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK} @@ -249,6 +226,8 @@ CONFIGURE_ARGS+= --enable-modules="${APA CONFIGURE_ARGS+= --enable-mods-shared="${APACHE_MODULES:O:L}" .endif +# ==================================== +# start pkg-plist adjustments .if defined(WITH_STATIC_MODULES) .for module in ${APACHE_MODULES} . if !${WITH_STATIC_MODULES:M${module}} @@ -268,6 +247,22 @@ ${module}_PLIST_SUB= "" .for module in ${AVAILABLE_MODULES:O:u} PLIST_SUB+= MOD_${module}=${${module}_PLIST_SUB} .endfor + +# pkg-plist workaround STATIC support +.if ${PORT_OPTIONS:MSUEXEC} +PLIST_SUB+= SUEXEC="" +.else +PLIST_SUB+= SUEXEC="@comment " +.endif + +.if ${PORT_OPTIONS:MLOG_FORENSIC} +PLIST_SUB+= FORENSIC="" +.else +PLIST_SUB+= FORENSIC="@comment " +.endif + +# end pkg-plist adjustments + #### End of AP_PORT_IS_SERVER #### # =============================================================== @@ -409,6 +404,10 @@ IGNORE= ${_ERROR_MSG} specify only one o IGNORE= ${_ERROR_MSG} use USE_APACHE instead of USE_APACHE_BUILD and USE_APACHE_RUN together .endif +.if defined(NO_BUILD) && defined(USE_APACHE) +IGNORE= If NO_BUILD is used, then USE_APACHE_RUN is sufficient. Please fix your Makefile +.endif + .if defined(AP_PORT_IS_SERVER) .if !target(print-closest-mirrors) print-closest-mirrors: @@ -422,14 +421,6 @@ print-closest-mirrors: ${ECHO_MSG} "No mirrors found!">&2 ; fi .endif -.if !target(show-categories) -show-categories: -.for category in ${ALL_MODULES_CATEGORIES} - @${ECHO_MSG} "${category} contains these modules:" - @${ECHO_MSG} " ${${category}_MODULES}" -.endfor -.endif - .if !target(show-modules) show-modules: .for module in ${AVAILABLE_MODULES} @@ -447,19 +438,6 @@ show-modules: .endfor .endif -# MFC TODO: remove this target it's useless with options NG -.if !target(make-options-list) -make-options-list: - @${ECHO_CMD} OPTIONS+= \\; -.for module in ${AVAILABLE_MODULES} -. if ${APACHE_MODULES:M${module}} - @${ECHO} -e "\t ${module} \"mod_${module:L}\" on \\" -. else - @${ECHO} -e "\t ${module} \"mod_${module:L}\" off \\" -. endif -.endfor -.endif - .elif defined(AP_PORT_IS_MODULE) .if defined(AP_FAST_BUILD) Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -31,8 +31,8 @@ NDBM_DESC= NDBM support .include -APR_VERSION= 1.4.5 -APU_VERSION= 1.3.12 +APR_VERSION= 1.4.6 +APU_VERSION= 1.4.1 USE_ICONV= yes USE_AUTOTOOLS= automake autoconf libtool:env @@ -49,7 +49,7 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VER PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" SHLIB_APR_MAJOR= 4 -SHLIB_APU_MAJOR= 3 +SHLIB_APU_MAJOR= 4 APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ @@ -61,31 +61,16 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} APR_CONF_ARGS+= --enable-threads .else APR_CONF_ARGS+= --disable-threads -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr -. else -PKGNAMESUFFIX= -nothr -. endif .endif .if ${PORT_OPTIONS:MIPV6} APR_CONF_ARGS+= --enable-ipv6 -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6 -. else -PKGNAMESUFFIX= -ipv6 -. endif .else APR_CONF_ARGS+= --disable-ipv6 .endif .if ${PORT_OPTIONS:MDEVRANDOM} APR_CONF_ARGS+= --with-devrandom -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom -. else -PKGNAMESUFFIX= -devrandom -. endif .else APR_CONF_ARGS+= --without-devrandom .endif @@ -96,11 +81,6 @@ PLIST_SUB+= GDBM="" APU_EXTRAS= yes LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm -. else -PKGNAMESUFFIX= -gdbm -. endif .else PLIST_SUB+= GDBM="@comment " APU_CONF_ARGS+= --without-gdbm @@ -111,11 +91,6 @@ APU_EXTRAS= yes PLIST_SUB+= BDB="" USE_BDB= 42+ APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -. else -PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -. endif .else PLIST_SUB+= BDB="@comment " APU_CONF_ARGS+= --without-berkeley-db @@ -125,11 +100,6 @@ APU_CONF_ARGS+= --without-berkeley-db APU_EXTRAS= yes PLIST_SUB+= NDBM="" APU_CONF_ARGS+= --with-ndbm=/usr -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm -. else -PKGNAMESUFFIX= -ndbm -. endif .else PLIST_SUB+= NDBM="@comment " APU_CONF_ARGS+= --without-ndbm @@ -141,11 +111,6 @@ PLIST_SUB+= LDAP="" USE_OPENLDAP= yes APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER} -. else -PKGNAMESUFFIX= -ldap -. endif .else PLIST_SUB+= LDAP="@comment " APU_CONF_ARGS+= --without-ldap @@ -159,11 +124,6 @@ APU_CONF_ARGS+= --with-mysql=${LOCALBASE CONFIGURE_ENV+= LIBS="${LIBS}" CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H LDFLAGS+= -L${LOCALBASE}/lib/mysql -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER} -. else -PKGNAMESUFFIX= -mysql -. endif .else PLIST_SUB+= MYSQL="@comment " APU_CONF_ARGS+= --without-mysql @@ -175,11 +135,6 @@ PLIST_SUB+= PGSQL="" USE_PGSQL= YES APU_CONF_ARGS+= --with-pgsql=${LOCALBASE} CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG="" -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER} -. else -PKGNAMESUFFIX= -pgsql -. endif .else PLIST_SUB+= PGSQL="@comment " APU_CONF_ARGS+= --without-pgsql @@ -190,11 +145,6 @@ APU_EXTRAS= yes PLIST_SUB+= SQLITE3="" USE_SQLITE= YES APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3 -. else -PKGNAMESUFFIX= -sqlite3 -. endif .else APU_CONF_ARGS+= --without-sqlite3 PLIST_SUB+= SQLITE3="@comment " @@ -218,6 +168,9 @@ post-patch: ${APR_WRKDIR}/build/gen-build.py ${REINPLACE_CMD} -e 's/void main/int main/' ${APR_WRKDIR}/build/apr_network.m4 +# http://svn.apache.org/viewvc?view=revision&revision=1362895 + ${REINPLACE_CMD} -e 's|sql = apr_palloc|sql = apr_pcalloc|' ${APU_WRKDIR}/dbd/apr_dbd_freetds.c + run-autotools:: cd ${APR_WRKDIR} ; \ ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf @@ -248,8 +201,8 @@ do-install: cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} test: build - @(cd ${APR_WRKDIR}; ${MAKE} test) - @(cd ${APU_WRKDIR}; ${MAKE} test) + -@(cd ${APR_WRKDIR}; ${MAKE} test) + -@(cd ${APU_WRKDIR}; ${MAKE} test) #regression-test: test Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/distinfo Sun Sep 2 14:31:58 2012 (r303550) @@ -1,4 +1,4 @@ -SHA256 (apr-1.4.5.tar.gz) = 7323d5f72d6bddf7d1ecb63e4326df82a66210018bb2f1e8f6d97357e68302df -SIZE (apr-1.4.5.tar.gz) = 994320 -SHA256 (apr-util-1.3.12.tar.gz) = 815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8 -SIZE (apr-util-1.3.12.tar.gz) = 769076 +SHA256 (apr-1.4.6.tar.gz) = 538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05 +SIZE (apr-1.4.6.tar.gz) = 982243 +SHA256 (apr-util-1.4.1.tar.gz) = d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c +SIZE (apr-util-1.4.1.tar.gz) = 774770 Modified: head/devel/apr1/files/patch-apr_hints.m4 ============================================================================== --- head/devel/apr1/files/patch-apr_hints.m4 Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/files/patch-apr_hints.m4 Sun Sep 2 14:31:58 2012 (r303550) @@ -1,5 +1,5 @@ ---- apr-1.4.5/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 -+++ apr-1.4.5/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +--- apr-1.4.6/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.4.6/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 @@ -159,11 +159,7 @@ ;; *-freebsd*) Modified: head/devel/apr1/pkg-plist ============================================================================== --- head/devel/apr1/pkg-plist Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/pkg-plist Sun Sep 2 14:31:58 2012 (r303550) @@ -6,6 +6,7 @@ include/apr-1/apr_anylock.h include/apr-1/apr_atomic.h include/apr-1/apr_base64.h include/apr-1/apr_buckets.h +include/apr-1/apr_crypto.h include/apr-1/apr_date.h include/apr-1/apr_dbd.h include/apr-1/apr_dbm.h @@ -65,6 +66,7 @@ include/apr-1/apr_want.h include/apr-1/apr_xlate.h include/apr-1/apr_xml.h include/apr-1/apu.h +include/apr-1/apu_errno.h include/apr-1/apu_version.h include/apr-1/apu_want.h %%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so Modified: head/www/apache22-event-mpm/Makefile ============================================================================== --- head/www/apache22-event-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-event-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,10 +1,4 @@ -# New ports collection makefile for: apache22-event-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ -# - MASTERDIR= ${.CURDIR}/../apache22 @@ -12,7 +6,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= event -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22-itk-mpm/Makefile ============================================================================== --- head/www/apache22-itk-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-itk-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,12 +1,14 @@ -# New ports collection makefile for: apache22-itk-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ # # To build this port with the additional mpm-itk-perdir-regex # patch use -DWITH_ITK_PERDIR_REGEX # +# To build this port with the additional mpm-itk-limits +# patch use -DWITH_ITK_LIMITS +# +# Note: +# It's not possible to use both patches together +#´ # For a quick description take a look into the mpm-itk* patches # in the apache22/files directory @@ -16,7 +18,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= itk -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22-peruser-mpm/Makefile ============================================================================== --- head/www/apache22-peruser-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-peruser-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,13 +1,9 @@ -# New ports collection makefile for: apache22-peruser-mpm +# $FreeBSD$ +# # Apache 2.2.X with peruser mpm 0.3.0-dc3 -# Date created: 13 Sep 2008 -# Whom: Jille Timmermans # Peruser main url: http://telana.com/peruser.php # Peruser patches: http://source.kood.ee/ # This port contains the main patch, including the dc3 patch -# -# $FreeBSD$ -# MASTERDIR= ${.CURDIR}/../apache22 @@ -15,7 +11,7 @@ MAINTAINER= jille@quis.cx WITH_MPM= peruser -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch Modified: head/www/apache22-worker-mpm/Makefile ============================================================================== --- head/www/apache22-worker-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-worker-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,10 +1,4 @@ -# New ports collection makefile for: apache22-worker-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ -# - MASTERDIR= ${.CURDIR}/../apache22 @@ -12,7 +6,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= worker -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,22 +1,15 @@ -# New ports collection makefile for: apache22 -# Date created: Dec 11 2004 -# Whom: Clement Laforet -# # $FreeBSD$ -# -# For more information, please read Makefile.doc -# -PORTNAME= apache +PORTNAME= apache22 PORTVERSION= 2.2.22 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} DIST_SUBDIR= apache22 MAINTAINER?= apache@FreeBSD.org -COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM:L} MPM. +COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM} MPM. LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ apr-1:${PORTSDIR}/devel/apr1 \ @@ -24,14 +17,11 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ MAKE_JOBS_SAFE= yes -# to be removed if port is renamed to apache22 -ETCDIR= ${PREFIX}/etc/${PORTNAME}22 -WWWDIR= ${PREFIX}/www/${PORTNAME}22 LATEST_LINK?= apache22 CONFLICTS= caudium14-1.* \ apache-2.0.* apache-*-2.0.* \ - apache-*-2.2.* + apache-*-2.2.* apache22-*-2.2.* USE_APACHE= common22 USE_BZIP2= yes @@ -58,8 +48,17 @@ MPM_ITK_VERSION?= 20110321-01 .include "${APACHEDIR}/Makefile.options" .include +.include "${APACHEDIR}/Makefile.doc" + +APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config +APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config -APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config +# APU modules used by AUTHN_DBD DBD +APU_DBD_MYSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_mysql.so +APU_DBD_PGSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_pgsql.so +APU_DBD_SQLITE3?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_sqlite3.so +# APU module used by AUTHNZ_LDAP LDAP +APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --enable-layout=FreeBSD \ @@ -69,7 +68,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDES --with-iconv=${LOCALBASE} \ --enable-http \ --with-pcre=${LOCALBASE} \ - --with-apr=${LOCALBASE}/bin/apr-1-config \ + --with-apr=${APR_CONFIG} \ --with-apr-util=${APU_CONFIG} CONFIGURE_ENV= \ @@ -81,54 +80,36 @@ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},, MAKE_ENV+= EXPR_COMPAT=yes \ INSTALL_MAN="${INSTALL_MAN}" -# ============================================= +#===================================================== # CONFIGURE_ARGS willl be handled in Makefile.modules, # here we do only OPTIONS fixups -.if defined(WITH_SUEXEC_RSRCLIMIT) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit -.if !defined(WITH_SUEXEC) -IGNORE= suEXEC resource limit patch requires mod_suexec.\ - Please (re)run 'make config' and choose SUEXEC option also -.endif -.endif - -.if !defined(WITHOUT_SSL) +.if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes -WITH_MODULES+= SSL -.endif - -.if defined(WITH_AUTHNZ_LDAP) -WITH_LDAP= yes .endif -.if defined (WITH_LDAP) -USE_OPENLDAP= yes -WITH_AUTHNZ_LDAP=yes -.endif - -.if defined(WITH_MYSQL) -USE_MYSQL= yes -WITH_THREADS= yes -.endif - -.if defined(WITH_PGSQL) -USE_PGSQL= yes +.if ${PORT_OPTIONS:MSUEXEC_RSRCLIMIT} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit +. if empty(PORT_OPTIONS:MSUEXEC) +IGNORE= suEXEC resource limit patch requires mod_suexec.\ + Please (re)run 'make config' and choose SUEXEC option also +. endif .endif -.if defined(WITH_SQLITE) -USE_SQLITE= yes +.if ${PORT_OPTIONS:MSUEXEC_USERDIR} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_userdir +. if empty(PORT_OPTIONS:MSUEXEC) +IGNORE= suEXEC UserDir patch requires mod_suexec.\ + Please (re)run 'make config' and choose SUEXEC option also +. endif .endif -.include "${APACHEDIR}/Makefile.doc" .include .include "${APACHEDIR}/Makefile.modules" -pre-everything:: +pre-configure:: @${ECHO_MSG} "" @${ECHO_MSG} " You can check your modules configuration by using make show-modules" - @${ECHO_MSG} " To see all available knobs, type make show-options" - @${ECHO_MSG} " To see all modules in different categories, type make show-categories" @${ECHO_MSG} "" show-options: @@ -146,19 +127,28 @@ post-configure: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std post-install: - @${MKDIR} ${PREFIX}/etc/apache22/envvars.d - @${MKDIR} ${PREFIX}/etc/apache22/Includes - @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${PREFIX}/etc/apache22/Includes + @${MKDIR} ${ETCDIR}/envvars.d + @${MKDIR} ${ETCDIR}/Includes + @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${ETCDIR}/Includes/ -.if defined(WITH_LOG_FORENSIC) +.if ${PORT_OPTIONS:MLOG_FORENSIC} @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${PREFIX}/sbin .endif -.if !defined(NOPORTDOCS) -.for dir in style/lang style/xsl/util style/xsl +.if ${PORT_OPTIONS:MDOCS} +. for dir in style/lang style/xsl/util style/xsl @[ -d ${DOCSDIR}/${dir}/ ] && ${TOUCH} ${DOCSDIR}/${dir}/.keepme -.endfor +. endfor .endif @${CAT} ${PKGMESSAGE} +# maintainer only, check for new modules +modlist: extract + @${AWK} '/: checking whether to enable mod_/ \ + {printf "%%%%%s%%%%libexec/apache22/%s.so\n", \ + toupper($$8), $$8}' ${WRKSRC}/configure \ + | ${TR} -d '"' \ + | ${GREP} -E -v 'MOD_(ECHO|EXAMPLE|HTTP|IDENT|ISAPI|SO)' \ + | ${SORT} -u + .include Modified: head/www/apache22/Makefile.doc ============================================================================== --- head/www/apache22/Makefile.doc Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.doc Sun Sep 2 14:31:58 2012 (r303550) @@ -1,13 +1,7 @@ -# Makefile.doc -# Author: Clement Laforet -# -# This files contains: -# - make options output -# - apache22 man/docs routines -# # $FreeBSD$ # - +# Author: Clement Laforet +# ## ## By default, modules are compiled as dynamically loadable modules (DSO). ## @@ -21,11 +15,9 @@ ## event ## itk ## WITH_HTTP_PORT: default: 80 -## WITHOUT_V4MAPPED -## WITH_IPV6_V6ONLY: Don't allow IPv6 sockets to handle IPv4 -## connections +## ## WITH_STATIC_SUPPORT: Build statically linked support binaries -## WITH_STATIC_APACHE: Build a static version of httpd (implies +## WITH_STATIC_APACHE: Build a static version of httpd (implies ## WITH_STATIC_MODULES) ## WITH_ALL_STATIC_MODULES: All modules will be statically linked. ## WITH_STATIC_MODULES (*): List of modules to build modules statics @@ -34,25 +26,26 @@ ## WITH_MODULES or with default configuration ## use 'make show-modules', to check if they are ## enabled) -## WITH_SUEXEC: Enable suExec support -## SUEXEC_DOCROOT: SuExec root directory +## WITH_SUEXEC: Enable suEXEC support +## SUEXEC_DOCROOT: suEXEC root directory ## SUEXEC_USERDIR: User subdirectory (default public_html) ## SUEXEC_SAFEPATH: Set the safepath -## SUEXEC_LOGFILE: Set log file for suexec (default: /var/log/httpd-suexec.log) +## SUEXEC_LOGFILE: Set log file for suEXEC (default: /var/log/httpd-suexec.log) ## SUEXEC_UIDMIN: Minimal allowed UID (default 1000) ## SUEXEC_GIDMIN: Minimal allowed GID (default 1000) -## SUEXEC_CALLER: User allowed to call SuExec (default +## SUEXEC_CALLER: User allowed to call suEXEC (default ## ${WWWOWN} (www)) -## SUEXEC_UMASK: Defines umask for suexec'd process(default: +## SUEXEC_UMASK: Defines umask for suEXEC'd process(default: ## unset) -## WITH_DEBUG: Build a debug versoin of apache (set CFLAGS +## WITH_DEBUG: Build a debug version of apache (set CFLAGS ## to "-O0 -g -ggdb3" or ${DEBUG_FLAGS} and ## defines WITH_EXCEPTION_HOOK too) ## WITH_EXCEPTION_HOOK: Enable fatal exception hook ## -## Optional patches: +## Optional patches without option: ## WITH_ITK_PERDIR_REGEX Add the per-directory setting AssignUserFromPath for mpm-itk ## as described on http://www.pvv.ntnu.no/~knuta/mpm-itk/ +## WITH_ITK_LIMITS Add rlimits based on login class for mpm-itk ## ## Available make targets: ## config: open the configure dialog @@ -61,16 +54,14 @@ ## show-modules: prints list of available modules ## ## Examples (*): -## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" WITH_EXPERIMENTAL_MODULES=yes +## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" ## Note: If you define your custom options in /etc/make.conf, don't forget ## to do not use quotes. ## -DOCSDIR= ${PREFIX}/share/doc/apache22 -EXAMPLESDIR= ${PREFIX}/share/examples/apache22 MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR} -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) MAKE_ENV+= NOPORTDOCS=yes .endif Modified: head/www/apache22/Makefile.modules ============================================================================== --- head/www/apache22/Makefile.modules Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.modules Sun Sep 2 14:31:58 2012 (r303550) @@ -1,61 +1,101 @@ -# Makefile.modules -# Author: Clement Laforet -# -# This file is used to build modules list, DBM dependencies and MPM selection. -# I hope it can easily handle external modules (such as mod_perl) or MPMs, like -# muxmpm. +# $FreeBSD$ # -# Note to myself: (to generate PLIST_SUB entries for modules) +# Note by Clement Laforet: (to generate PLIST_SUB entries for modules) # gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp # mv tmp pkg-plist # -# $FreeBSD$ -# + +# ============================================= +# Maintainer note for OPTION handling: +# To set additional option use +# PORT_OPTIONS+= +# To unset an OPTION, even the OPTION is set in OPTIONSFILE use +# WITHOUT_MODULES+= +# Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected +# if the OPTION is enabled by the user, therefore we calculate +# them in bsd.apache.mk with help of WITHOUT_MODULES +# The other methode is to set IGNORE's and force the user to adjust OPTIONS .if defined(_PREMKINCLUDED) + +# check if APR was build with thread support +.if exists(${APR_CONFIG}) +APR_LIBS!= ${SH} ${APR_CONFIG} --libs | ${SED} -e 's/-//g' +. if defined(APR_LIBS) && !empty(APR_LIBS) +_T=pthread +. for lib in ${APR_LIBS} +. if ${_T:M${lib}} +APR_HAS_THREADS= yes +. endif +. endfor +. endif +.endif # exists APR_CONFIG + +# check if APR-util module exists +.if exists(${APU_CONFIG}) +. if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MAUTHNZ_LDAP} +. if !exists(${APU_LDAP}) +IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\ + Please rebuild APR with LDAP support +. endif +. endif + +. if ${PORT_OPTIONS:MDBD} || ${PORT_OPTIONS:MAUTHN_DBD} +. if !exists(${APU_DBD_MYSQL}) && !exists(${APU_DBD_PGSQL}) && !exists(${APU_DBD_SQLITE3}) +IGNORE= AUTHN_DBD and DBD requires APR-util to have DBD support build in.\ + Please rebuild APR at last with one DBD backend +. endif +. endif +.endif # exists APU_CONFIG + # ============================================= # MPM's: prefork worker event itk peruser -.if ${WITH_MPM:L} == "prefork" +.if ${WITH_MPM} == "prefork" PLIST_SUB+= WORKER="@comment " EVENT="@comment " - -.elif ${WITH_MPM:L} == "worker" -PLIST_SUB+= WORKER="" EVENT="@comment " - -.elif ${WITH_MPM:L} == "event" +.elif ${WITH_MPM} == "worker" +PLIST_SUB+= WORKER="" EVENT="@comment " +.elif ${WITH_MPM} == "event" PLIST_SUB+= WORKER="@comment " EVENT="" - -.elif ${WITH_MPM:L} == "peruser" +.elif ${WITH_MPM} == "peruser" PLIST_SUB+= WORKER="@comment " EVENT="@comment " - -.elif ${WITH_MPM:L} == "itk" +.elif ${WITH_MPM} == "itk" PLIST_SUB+= WORKER="@comment " EVENT="@comment " EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-${MPM_ITK_VERSION} -. if defined (WITH_ITK_PERDIR_REGEX) -EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex -. endif - +. if defined (WITH_ITK_PERDIR_REGEX) && defined (WITH_ITK_LIMITS) +IGNORE= Use only one patch option not both (WITH_ITK_PERDIR_REGEX or WITH_ITK_LIMITS) +. endif +. if defined (WITH_ITK_PERDIR_REGEX) +EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex +. endif +. if defined (WITH_ITK_LIMITS) +EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-limits +. endif .else -IGNORE= "Unknown MPM: ${WITH_MPM}" +IGNORE= Unknown MPM: ${WITH_MPM} .endif # MPM prefork -.if ${WITH_MPM:L} != "prefork" -PKGNAMESUFFIX= -${WITH_MPM:L} -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +.if ${WITH_MPM} != "prefork" +PKGNAMESUFFIX= -${WITH_MPM}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm .endif -.if ${WITH_MPM:L} == "worker" || ${WITH_MPM:L} == "event" -WITH_THREADS= yes -WITH_MODULES+= CGID -WITHOUT_MODULES+= CGI +.if ${WITH_MPM} == "worker" || ${WITH_MPM} == "event" +PORT_OPTIONS+= CGID +.if ${PORT_OPTIONS:MCGI} +IGNORE= does not build with CGI. Please de-select CGI and select CGID instead +.endif +.if exists(${APR_CONFIG}) && !defined(APR_HAS_THREADS) +IGNORE= requires APR threads. Please rebuild APR with THREAD support +. endif .endif # ============================================= -# XXX WITH_STATIC_SUPPORT : make.conf, or command line parameter +# The next three params are not converted to an option, +# they should be used only for special builds. .if defined(WITH_STATIC_SUPPORT) CONFIGURE_ARGS+= --enable-static-support .endif -# XXX WITH_DEBUG : make.conf, or command line parameter # debug overrides CFLAGS .if defined(WITH_DEBUG) DEBUG_FLAGS?= -O0 -g -ggdb3 @@ -64,53 +104,57 @@ CONFIGURE_ARGS+= --enable-maintainer-mod WITH_EXCEPTION_HOOK= yes .endif -# WITH_EXCEPTION_HOOK: parameter for command line or make.conf .if defined(WITH_EXCEPTION_HOOK) CONFIGURE_ARGS+= --enable-exception-hook .endif -.if !defined(WITHOUT_SSL) +.if ${PORT_OPTIONS:MSSL} CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .endif -.if defined (WITH_AUTHNZ_LDAP) +.if ${PORT_OPTIONS:MAUTHNZ_LDAP} CONFIGURE_ARGS+= --enable-authnz-ldap .endif -.if defined (WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+= --enable-ldap=shared .endif -.if !defined(WITH_THREADS) -WITHOUT_MODULES+= MEM_CACHE -. if defined(WITH_MEM_CACHE) -IGNORE+= mod_mem_cache requires WITH_THREADS -. endif -.else -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +.if ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} +. if !${APACHE_MODULES:MAUTHN*} +IGNORE= AUTH_BASIC and AUTH_DIGEST need at last one AUTHN provider +. endif .endif -.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) -WITHOUT_MODULES+= AUTHN_DBD DBD -. if defined(WITH_DBD) || defined(WITH_AUTHN_DBD) -IGNORE+= You need to enable at least one DBD backend -. endif +.if ${PORT_OPTIONS:MAUTH_BASIC} +. if !${APACHE_MODULES:MAUTHZ*} +IGNORE= AUTH_BASIC need at last one AUTHZ provider +. endif +.endif + +.if defined(APR_HAS_THREADS) +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} +.else +. if exists(${APR_CONFIG}) && ${PORT_OPTIONS:MMEM_CACHE} +IGNORE= MEM_CACHE requires APR threads. Please rebuild APR with THREAD support +. endif .endif -.if defined(WITHOUT_IPV6) +.if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+= --disable-ipv6 .else CATEGORIES+= ipv6 -. if defined(WITH_IPV6_V6ONLY) || defined(WITHOUT_V4MAPPED) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-server__config.c +. if ${PORT_OPTIONS:MIPV6_V6ONLY} CONFIGURE_ARGS+= --disable-v4-mapped -. else +. else CONFIGURE_ARGS+= --enable-v4-mapped -. endif +. endif .endif -CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} +CONFIGURE_ARGS+= --with-mpm=${WITH_MPM} .endif # _PREMKINCLUDED Modified: head/www/apache22/Makefile.options ============================================================================== --- head/www/apache22/Makefile.options Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.options Sun Sep 2 14:31:58 2012 (r303550) @@ -1,7 +1,14 @@ # $FreeBSD$ -.if !defined(Module_inc) -Module_inc= done +# XXX The follwing params are used for special buils, +# they will be not converted to an OPTION. +# WITH_MPM # prefork worker event itk peruser +# WITH_STATIC_SUPPORT # used in make.conf +# WITH_DEBUG # used in make.conf or as build param +# WITH_EXCEPTION_HOOK # used in make.conf or as build param +# WITH_ITK_PERDIR_REGEX # => itk-mpm extra patch +# WITH_ITK_LIMITS # => itk-mpm extra patch +# AUTH_MODULES= AUTH_BASIC AUTH_DIGEST AUTHN_MODULES= AUTHN_FILE AUTHN_DBD AUTHN_DBM AUTHN_ANON AUTHN_DEFAULT \ @@ -12,108 +19,245 @@ CACHE_MODULES= CACHE DISK_CACHE FILE_CA DAV_MODULES= DAV DAV_FS EXPERIMENTAL_MODULES= BUCKETEER CASE_FILTER CASE_FILTER_IN EXT_FILTER \ LOG_FORENSIC OPTIONAL_HOOK_EXPORT OPTIONAL_HOOK_IMPORT \ - OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT + OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT LDAP_MODULES= LDAP AUTHNZ_LDAP -MISC_MODULES+= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ +MISC_MODULES= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ CGI CHARSET_LITE DBD DEFLATE DIR DUMPIO ENV EXPIRES \ HEADERS IMAGEMAP INCLUDE INFO LOG_CONFIG LOGIO MIME \ MIME_MAGIC NEGOTIATION REWRITE SETENVIF SPELING STATUS SUBSTITUTE \ UNIQUE_ID USERDIR USERTRACK VHOST_ALIAS FILTER VERSION REQTIMEOUT -PROXY_MODULES= PROXY PROXY_CONNECT PROXY_FTP PROXY_HTTP PROXY_AJP PROXY_BALANCER \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" From owner-freebsd-apache@FreeBSD.ORG Sun Sep 2 14:40:18 2012 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 527A81065674 for ; Sun, 2 Sep 2012 14:40:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3C8F08FC15 for ; Sun, 2 Sep 2012 14:40:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q82EeICt087388 for ; Sun, 2 Sep 2012 14:40:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q82EeIh6087367; Sun, 2 Sep 2012 14:40:18 GMT (envelope-from gnats) Date: Sun, 2 Sep 2012 14:40:18 GMT Message-Id: <201209021440.q82EeIh6087367@freefall.freebsd.org> To: apache@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/130479: commit references a PR X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 14:40:18 -0000 The following reply was made to PR ports/130479; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/130479: commit references a PR Date: Sun, 2 Sep 2012 14:32:12 +0000 (UTC) Author: ohauer Date: Sun Sep 2 14:31:58 2012 New Revision: 303550 URL: http://svn.freebsd.org/changeset/ports/303550 Log: devel/apr1 [1] - update APR to 1.4.6 - update APR-util to 1.4.1 - remove PKGNAMESUFFIX'es www/apache-(event|itk|peruser|worker)-mpm - adopt new Makefile header, adjust PKGNAMESUFFIX in apache22 masterport PKGNAME match now LATEST_LINK www/apache22 [2]-[6] - rewrite for options NG - PORTNAME s|apache|apache22| - remove APR APR-util specific otions, will be checked now with help of apr/u-1-config Mk/bsd.apache.mk - rewrite for options NG - remove no longer needet make targets (show-categories, make-options-list) [1] PR: 165143 [2]-[6] PR: 130479 PR: 153406 PR: 158565 PR: 168769 PR: 167965 with hat apache@ Added: head/www/apache22/files/extra-patch-server__config.c (contents, props changed) head/www/apache22/files/extra-patch-suexec_userdir (contents, props changed) head/www/apache22/files/mpm-itk-limits (contents, props changed) Deleted: head/devel/apr1/files/patch-apr_ldap_rebind.c Modified: head/Mk/bsd.apache.mk (contents, props changed) head/devel/apr1/Makefile (contents, props changed) head/devel/apr1/distinfo (contents, props changed) head/devel/apr1/files/patch-apr_hints.m4 (contents, props changed) head/devel/apr1/pkg-plist (contents, props changed) head/www/apache22-event-mpm/Makefile head/www/apache22-itk-mpm/Makefile head/www/apache22-peruser-mpm/Makefile head/www/apache22-worker-mpm/Makefile head/www/apache22/Makefile head/www/apache22/Makefile.doc (contents, props changed) head/www/apache22/Makefile.modules head/www/apache22/Makefile.options head/www/apache22/pkg-plist (contents, props changed) Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Sun Sep 2 14:16:18 2012 (r303549) +++ head/Mk/bsd.apache.mk Sun Sep 2 14:31:58 2012 (r303550) @@ -116,14 +116,6 @@ IGNORE= ${_ERROR_MSG} Illegal use of USE # =============================================================== .if defined(AP_PORT_IS_SERVER) # MFC TODO: remove this check -# used only in apache22-peruser-mpm, remved in rev. 253708 -# http://svnweb.freebsd.org/ports?view=revision&revision=253708 -# For slave ports: -.if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR} -IGNORE= Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync ${PORTVERSION} != ${SLAVE_DESIGNED_FOR} -.endif - -# MFC TODO: remove this check # used only by www/cakephp* ports .if defined(SLAVE_PORT_MODULES) DEFAULT_MODULES_CATEGORIES+= SLAVE_PORT @@ -139,23 +131,12 @@ DEFAULT_MODULES+= ${${category}_MODULE AVAILABLE_MODULES+= ${${category}_MODULES} .endfor -# == start convert param to UPPERCASE -# detect lowercase params in make.conf, users should them to UPPERCASE -# In near future we will throw an IGNORE message -#_ERROR_DLCM= ... detected (make.conf), please convert apache releated params to UPPERCASE -.if defined(WITH_MODULES) && ${WITH_MODULES:M[a-z]*} -#IGNNORE= lowercase WITH_MODULES= ${_ERROR_DLCM} -WITH_MODULES:=${WITH_MODULES:U} -.endif -.if defined(WITHOUT_MODULES) && ${WITHOUT_MODULES:M[a-z]*} -#IGNORE= lowercase WITHOUT_MODULES= ${_ERROR_DLCM} -WITHOUT_MODULES:=${WITHOUT_MODULES:U} -.endif +# detect invalid lowercase params in make.conf +# keep this check until end of 2012 .if defined(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M[a-z]*} -#IGNORE= lowercase WITH_STATIC_MODULES= ${_ERROR_DLCM} -WITH_STATIC_MODULES:=${WITH_STATIC_MODULES:U} +IGNORE= lowercase WITH_STATIC_MODULES="${WITH_STATIC_MODULES}"\ + detected (make.conf), they shoud be UPPERCASE .endif -# == end convert param to UPPERCASE # Setting "@comment " as default. .for module in ${AVAILABLE_MODULES:O} @@ -169,40 +150,38 @@ _DISABLE_MODULES+= --disable-${module:L CONFIGURE_ARGS+= ${_DISABLE_MODULES:O:u} .endif -.if ( defined(OPTIONS) || defined(OPTIONS_DEFINE) ) && !(make(make-options-list)) +# OPTIONS handling .for module in ${AVAILABLE_MODULES} -. if defined(WITH_${module}) +. if ${PORT_OPTIONS:M${module}} _APACHE_MODULES+= ${module} -. endif -. if defined(WITHOUT_${module}) +. else WITHOUT_MODULES+= ${module} . endif .endfor -.endif .if !defined(WITH_STATIC_APACHE) -. if ${USE_APACHE:Mcommon2*} != "" # FYI #DYNAMIC_MODULES= so CONFIGURE_ARGS+= --enable-so -. endif .else -. if ${USE_APACHE:Mcommon2*} != "" CONFIGURE_ARGS+= --disable-so -. endif WITH_ALL_STATIC_MODULES= yes .endif -.if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES) -. if ${USE_APACHE:Mcommon2*} != "" +.if ${PORT_OPTIONS:MSUEXEC} _APACHE_MODULES+= ${SUEXEC_MODULES} SUEXEC_CONFARGS= with-suexec -. endif -# From now we're defaulting to apache 2.* +# SUEXEC_DOCROOT should exist SUEXEC_DOCROOT?= ${PREFIX}/www/data +#SUEXEC_DOCROOT?= ${WWWDIR} SUEXEC_USERDIR?= public_html +# avoid duplicate search paths +.if ${LOCALBASE} == ${PREFIX} +SUEXEC_SAFEPATH?= ${LOCALBASE}/bin:/usr/bin:/bin +.else SUEXEC_SAFEPATH?= ${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin +.endif SUEXEC_LOGFILE?= /var/log/httpd-suexec.log SUEXEC_UIDMIN?= 1000 SUEXEC_GIDMIN?= 1000 @@ -213,10 +192,8 @@ CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-c --${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \ --${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \ --${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \ - --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" -. if ${USE_APACHE:Mcommon2*} != "" -CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec" -. endif + --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \ + --${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec" . if defined(WITH_SUEXEC_UMASK) CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK} @@ -249,6 +226,8 @@ CONFIGURE_ARGS+= --enable-modules="${APA CONFIGURE_ARGS+= --enable-mods-shared="${APACHE_MODULES:O:L}" .endif +# ==================================== +# start pkg-plist adjustments .if defined(WITH_STATIC_MODULES) .for module in ${APACHE_MODULES} . if !${WITH_STATIC_MODULES:M${module}} @@ -268,6 +247,22 @@ ${module}_PLIST_SUB= "" .for module in ${AVAILABLE_MODULES:O:u} PLIST_SUB+= MOD_${module}=${${module}_PLIST_SUB} .endfor + +# pkg-plist workaround STATIC support +.if ${PORT_OPTIONS:MSUEXEC} +PLIST_SUB+= SUEXEC="" +.else +PLIST_SUB+= SUEXEC="@comment " +.endif + +.if ${PORT_OPTIONS:MLOG_FORENSIC} +PLIST_SUB+= FORENSIC="" +.else +PLIST_SUB+= FORENSIC="@comment " +.endif + +# end pkg-plist adjustments + #### End of AP_PORT_IS_SERVER #### # =============================================================== @@ -409,6 +404,10 @@ IGNORE= ${_ERROR_MSG} specify only one o IGNORE= ${_ERROR_MSG} use USE_APACHE instead of USE_APACHE_BUILD and USE_APACHE_RUN together .endif +.if defined(NO_BUILD) && defined(USE_APACHE) +IGNORE= If NO_BUILD is used, then USE_APACHE_RUN is sufficient. Please fix your Makefile +.endif + .if defined(AP_PORT_IS_SERVER) .if !target(print-closest-mirrors) print-closest-mirrors: @@ -422,14 +421,6 @@ print-closest-mirrors: ${ECHO_MSG} "No mirrors found!">&2 ; fi .endif -.if !target(show-categories) -show-categories: -.for category in ${ALL_MODULES_CATEGORIES} - @${ECHO_MSG} "${category} contains these modules:" - @${ECHO_MSG} " ${${category}_MODULES}" -.endfor -.endif - .if !target(show-modules) show-modules: .for module in ${AVAILABLE_MODULES} @@ -447,19 +438,6 @@ show-modules: .endfor .endif -# MFC TODO: remove this target it's useless with options NG -.if !target(make-options-list) -make-options-list: - @${ECHO_CMD} OPTIONS+= \\; -.for module in ${AVAILABLE_MODULES} -. if ${APACHE_MODULES:M${module}} - @${ECHO} -e "\t ${module} \"mod_${module:L}\" on \\" -. else - @${ECHO} -e "\t ${module} \"mod_${module:L}\" off \\" -. endif -.endfor -.endif - .elif defined(AP_PORT_IS_MODULE) .if defined(AP_FAST_BUILD) Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -31,8 +31,8 @@ NDBM_DESC= NDBM support .include -APR_VERSION= 1.4.5 -APU_VERSION= 1.3.12 +APR_VERSION= 1.4.6 +APU_VERSION= 1.4.1 USE_ICONV= yes USE_AUTOTOOLS= automake autoconf libtool:env @@ -49,7 +49,7 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VER PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" SHLIB_APR_MAJOR= 4 -SHLIB_APU_MAJOR= 3 +SHLIB_APU_MAJOR= 4 APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ @@ -61,31 +61,16 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} APR_CONF_ARGS+= --enable-threads .else APR_CONF_ARGS+= --disable-threads -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr -. else -PKGNAMESUFFIX= -nothr -. endif .endif .if ${PORT_OPTIONS:MIPV6} APR_CONF_ARGS+= --enable-ipv6 -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6 -. else -PKGNAMESUFFIX= -ipv6 -. endif .else APR_CONF_ARGS+= --disable-ipv6 .endif .if ${PORT_OPTIONS:MDEVRANDOM} APR_CONF_ARGS+= --with-devrandom -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom -. else -PKGNAMESUFFIX= -devrandom -. endif .else APR_CONF_ARGS+= --without-devrandom .endif @@ -96,11 +81,6 @@ PLIST_SUB+= GDBM="" APU_EXTRAS= yes LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm -. else -PKGNAMESUFFIX= -gdbm -. endif .else PLIST_SUB+= GDBM="@comment " APU_CONF_ARGS+= --without-gdbm @@ -111,11 +91,6 @@ APU_EXTRAS= yes PLIST_SUB+= BDB="" USE_BDB= 42+ APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -. else -PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -. endif .else PLIST_SUB+= BDB="@comment " APU_CONF_ARGS+= --without-berkeley-db @@ -125,11 +100,6 @@ APU_CONF_ARGS+= --without-berkeley-db APU_EXTRAS= yes PLIST_SUB+= NDBM="" APU_CONF_ARGS+= --with-ndbm=/usr -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm -. else -PKGNAMESUFFIX= -ndbm -. endif .else PLIST_SUB+= NDBM="@comment " APU_CONF_ARGS+= --without-ndbm @@ -141,11 +111,6 @@ PLIST_SUB+= LDAP="" USE_OPENLDAP= yes APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER} -. else -PKGNAMESUFFIX= -ldap -. endif .else PLIST_SUB+= LDAP="@comment " APU_CONF_ARGS+= --without-ldap @@ -159,11 +124,6 @@ APU_CONF_ARGS+= --with-mysql=${LOCALBASE CONFIGURE_ENV+= LIBS="${LIBS}" CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H LDFLAGS+= -L${LOCALBASE}/lib/mysql -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER} -. else -PKGNAMESUFFIX= -mysql -. endif .else PLIST_SUB+= MYSQL="@comment " APU_CONF_ARGS+= --without-mysql @@ -175,11 +135,6 @@ PLIST_SUB+= PGSQL="" USE_PGSQL= YES APU_CONF_ARGS+= --with-pgsql=${LOCALBASE} CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG="" -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER} -. else -PKGNAMESUFFIX= -pgsql -. endif .else PLIST_SUB+= PGSQL="@comment " APU_CONF_ARGS+= --without-pgsql @@ -190,11 +145,6 @@ APU_EXTRAS= yes PLIST_SUB+= SQLITE3="" USE_SQLITE= YES APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3 -. else -PKGNAMESUFFIX= -sqlite3 -. endif .else APU_CONF_ARGS+= --without-sqlite3 PLIST_SUB+= SQLITE3="@comment " @@ -218,6 +168,9 @@ post-patch: ${APR_WRKDIR}/build/gen-build.py ${REINPLACE_CMD} -e 's/void main/int main/' ${APR_WRKDIR}/build/apr_network.m4 +# http://svn.apache.org/viewvc?view=revision&revision=1362895 + ${REINPLACE_CMD} -e 's|sql = apr_palloc|sql = apr_pcalloc|' ${APU_WRKDIR}/dbd/apr_dbd_freetds.c + run-autotools:: cd ${APR_WRKDIR} ; \ ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf @@ -248,8 +201,8 @@ do-install: cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} test: build - @(cd ${APR_WRKDIR}; ${MAKE} test) - @(cd ${APU_WRKDIR}; ${MAKE} test) + -@(cd ${APR_WRKDIR}; ${MAKE} test) + -@(cd ${APU_WRKDIR}; ${MAKE} test) #regression-test: test Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/distinfo Sun Sep 2 14:31:58 2012 (r303550) @@ -1,4 +1,4 @@ -SHA256 (apr-1.4.5.tar.gz) = 7323d5f72d6bddf7d1ecb63e4326df82a66210018bb2f1e8f6d97357e68302df -SIZE (apr-1.4.5.tar.gz) = 994320 -SHA256 (apr-util-1.3.12.tar.gz) = 815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8 -SIZE (apr-util-1.3.12.tar.gz) = 769076 +SHA256 (apr-1.4.6.tar.gz) = 538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05 +SIZE (apr-1.4.6.tar.gz) = 982243 +SHA256 (apr-util-1.4.1.tar.gz) = d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c +SIZE (apr-util-1.4.1.tar.gz) = 774770 Modified: head/devel/apr1/files/patch-apr_hints.m4 ============================================================================== --- head/devel/apr1/files/patch-apr_hints.m4 Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/files/patch-apr_hints.m4 Sun Sep 2 14:31:58 2012 (r303550) @@ -1,5 +1,5 @@ ---- apr-1.4.5/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 -+++ apr-1.4.5/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +--- apr-1.4.6/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.4.6/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 @@ -159,11 +159,7 @@ ;; *-freebsd*) Modified: head/devel/apr1/pkg-plist ============================================================================== --- head/devel/apr1/pkg-plist Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/pkg-plist Sun Sep 2 14:31:58 2012 (r303550) @@ -6,6 +6,7 @@ include/apr-1/apr_anylock.h include/apr-1/apr_atomic.h include/apr-1/apr_base64.h include/apr-1/apr_buckets.h +include/apr-1/apr_crypto.h include/apr-1/apr_date.h include/apr-1/apr_dbd.h include/apr-1/apr_dbm.h @@ -65,6 +66,7 @@ include/apr-1/apr_want.h include/apr-1/apr_xlate.h include/apr-1/apr_xml.h include/apr-1/apu.h +include/apr-1/apu_errno.h include/apr-1/apu_version.h include/apr-1/apu_want.h %%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so Modified: head/www/apache22-event-mpm/Makefile ============================================================================== --- head/www/apache22-event-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-event-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,10 +1,4 @@ -# New ports collection makefile for: apache22-event-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ -# - MASTERDIR= ${.CURDIR}/../apache22 @@ -12,7 +6,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= event -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22-itk-mpm/Makefile ============================================================================== --- head/www/apache22-itk-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-itk-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,12 +1,14 @@ -# New ports collection makefile for: apache22-itk-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ # # To build this port with the additional mpm-itk-perdir-regex # patch use -DWITH_ITK_PERDIR_REGEX # +# To build this port with the additional mpm-itk-limits +# patch use -DWITH_ITK_LIMITS +# +# Note: +# It's not possible to use both patches together +#´ # For a quick description take a look into the mpm-itk* patches # in the apache22/files directory @@ -16,7 +18,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= itk -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22-peruser-mpm/Makefile ============================================================================== --- head/www/apache22-peruser-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-peruser-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,13 +1,9 @@ -# New ports collection makefile for: apache22-peruser-mpm +# $FreeBSD$ +# # Apache 2.2.X with peruser mpm 0.3.0-dc3 -# Date created: 13 Sep 2008 -# Whom: Jille Timmermans # Peruser main url: http://telana.com/peruser.php # Peruser patches: http://source.kood.ee/ # This port contains the main patch, including the dc3 patch -# -# $FreeBSD$ -# MASTERDIR= ${.CURDIR}/../apache22 @@ -15,7 +11,7 @@ MAINTAINER= jille@quis.cx WITH_MPM= peruser -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch Modified: head/www/apache22-worker-mpm/Makefile ============================================================================== --- head/www/apache22-worker-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-worker-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,10 +1,4 @@ -# New ports collection makefile for: apache22-worker-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ -# - MASTERDIR= ${.CURDIR}/../apache22 @@ -12,7 +6,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= worker -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,22 +1,15 @@ -# New ports collection makefile for: apache22 -# Date created: Dec 11 2004 -# Whom: Clement Laforet -# # $FreeBSD$ -# -# For more information, please read Makefile.doc -# -PORTNAME= apache +PORTNAME= apache22 PORTVERSION= 2.2.22 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} DIST_SUBDIR= apache22 MAINTAINER?= apache@FreeBSD.org -COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM:L} MPM. +COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM} MPM. LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ apr-1:${PORTSDIR}/devel/apr1 \ @@ -24,14 +17,11 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ MAKE_JOBS_SAFE= yes -# to be removed if port is renamed to apache22 -ETCDIR= ${PREFIX}/etc/${PORTNAME}22 -WWWDIR= ${PREFIX}/www/${PORTNAME}22 LATEST_LINK?= apache22 CONFLICTS= caudium14-1.* \ apache-2.0.* apache-*-2.0.* \ - apache-*-2.2.* + apache-*-2.2.* apache22-*-2.2.* USE_APACHE= common22 USE_BZIP2= yes @@ -58,8 +48,17 @@ MPM_ITK_VERSION?= 20110321-01 .include "${APACHEDIR}/Makefile.options" .include +.include "${APACHEDIR}/Makefile.doc" + +APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config +APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config -APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config +# APU modules used by AUTHN_DBD DBD +APU_DBD_MYSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_mysql.so +APU_DBD_PGSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_pgsql.so +APU_DBD_SQLITE3?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_sqlite3.so +# APU module used by AUTHNZ_LDAP LDAP +APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --enable-layout=FreeBSD \ @@ -69,7 +68,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDES --with-iconv=${LOCALBASE} \ --enable-http \ --with-pcre=${LOCALBASE} \ - --with-apr=${LOCALBASE}/bin/apr-1-config \ + --with-apr=${APR_CONFIG} \ --with-apr-util=${APU_CONFIG} CONFIGURE_ENV= \ @@ -81,54 +80,36 @@ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},, MAKE_ENV+= EXPR_COMPAT=yes \ INSTALL_MAN="${INSTALL_MAN}" -# ============================================= +#===================================================== # CONFIGURE_ARGS willl be handled in Makefile.modules, # here we do only OPTIONS fixups -.if defined(WITH_SUEXEC_RSRCLIMIT) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit -.if !defined(WITH_SUEXEC) -IGNORE= suEXEC resource limit patch requires mod_suexec.\ - Please (re)run 'make config' and choose SUEXEC option also -.endif -.endif - -.if !defined(WITHOUT_SSL) +.if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes -WITH_MODULES+= SSL -.endif - -.if defined(WITH_AUTHNZ_LDAP) -WITH_LDAP= yes .endif -.if defined (WITH_LDAP) -USE_OPENLDAP= yes -WITH_AUTHNZ_LDAP=yes -.endif - -.if defined(WITH_MYSQL) -USE_MYSQL= yes -WITH_THREADS= yes -.endif - -.if defined(WITH_PGSQL) -USE_PGSQL= yes +.if ${PORT_OPTIONS:MSUEXEC_RSRCLIMIT} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit +. if empty(PORT_OPTIONS:MSUEXEC) +IGNORE= suEXEC resource limit patch requires mod_suexec.\ + Please (re)run 'make config' and choose SUEXEC option also +. endif .endif -.if defined(WITH_SQLITE) -USE_SQLITE= yes +.if ${PORT_OPTIONS:MSUEXEC_USERDIR} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_userdir +. if empty(PORT_OPTIONS:MSUEXEC) +IGNORE= suEXEC UserDir patch requires mod_suexec.\ + Please (re)run 'make config' and choose SUEXEC option also +. endif .endif -.include "${APACHEDIR}/Makefile.doc" .include .include "${APACHEDIR}/Makefile.modules" -pre-everything:: +pre-configure:: @${ECHO_MSG} "" @${ECHO_MSG} " You can check your modules configuration by using make show-modules" - @${ECHO_MSG} " To see all available knobs, type make show-options" - @${ECHO_MSG} " To see all modules in different categories, type make show-categories" @${ECHO_MSG} "" show-options: @@ -146,19 +127,28 @@ post-configure: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std post-install: - @${MKDIR} ${PREFIX}/etc/apache22/envvars.d - @${MKDIR} ${PREFIX}/etc/apache22/Includes - @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${PREFIX}/etc/apache22/Includes + @${MKDIR} ${ETCDIR}/envvars.d + @${MKDIR} ${ETCDIR}/Includes + @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${ETCDIR}/Includes/ -.if defined(WITH_LOG_FORENSIC) +.if ${PORT_OPTIONS:MLOG_FORENSIC} @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${PREFIX}/sbin .endif -.if !defined(NOPORTDOCS) -.for dir in style/lang style/xsl/util style/xsl +.if ${PORT_OPTIONS:MDOCS} +. for dir in style/lang style/xsl/util style/xsl @[ -d ${DOCSDIR}/${dir}/ ] && ${TOUCH} ${DOCSDIR}/${dir}/.keepme -.endfor +. endfor .endif @${CAT} ${PKGMESSAGE} +# maintainer only, check for new modules +modlist: extract + @${AWK} '/: checking whether to enable mod_/ \ + {printf "%%%%%s%%%%libexec/apache22/%s.so\n", \ + toupper($$8), $$8}' ${WRKSRC}/configure \ + | ${TR} -d '"' \ + | ${GREP} -E -v 'MOD_(ECHO|EXAMPLE|HTTP|IDENT|ISAPI|SO)' \ + | ${SORT} -u + .include Modified: head/www/apache22/Makefile.doc ============================================================================== --- head/www/apache22/Makefile.doc Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.doc Sun Sep 2 14:31:58 2012 (r303550) @@ -1,13 +1,7 @@ -# Makefile.doc -# Author: Clement Laforet -# -# This files contains: -# - make options output -# - apache22 man/docs routines -# # $FreeBSD$ # - +# Author: Clement Laforet +# ## ## By default, modules are compiled as dynamically loadable modules (DSO). ## @@ -21,11 +15,9 @@ ## event ## itk ## WITH_HTTP_PORT: default: 80 -## WITHOUT_V4MAPPED -## WITH_IPV6_V6ONLY: Don't allow IPv6 sockets to handle IPv4 -## connections +## ## WITH_STATIC_SUPPORT: Build statically linked support binaries -## WITH_STATIC_APACHE: Build a static version of httpd (implies +## WITH_STATIC_APACHE: Build a static version of httpd (implies ## WITH_STATIC_MODULES) ## WITH_ALL_STATIC_MODULES: All modules will be statically linked. ## WITH_STATIC_MODULES (*): List of modules to build modules statics @@ -34,25 +26,26 @@ ## WITH_MODULES or with default configuration ## use 'make show-modules', to check if they are ## enabled) -## WITH_SUEXEC: Enable suExec support -## SUEXEC_DOCROOT: SuExec root directory +## WITH_SUEXEC: Enable suEXEC support +## SUEXEC_DOCROOT: suEXEC root directory ## SUEXEC_USERDIR: User subdirectory (default public_html) ## SUEXEC_SAFEPATH: Set the safepath -## SUEXEC_LOGFILE: Set log file for suexec (default: /var/log/httpd-suexec.log) +## SUEXEC_LOGFILE: Set log file for suEXEC (default: /var/log/httpd-suexec.log) ## SUEXEC_UIDMIN: Minimal allowed UID (default 1000) ## SUEXEC_GIDMIN: Minimal allowed GID (default 1000) -## SUEXEC_CALLER: User allowed to call SuExec (default +## SUEXEC_CALLER: User allowed to call suEXEC (default ## ${WWWOWN} (www)) -## SUEXEC_UMASK: Defines umask for suexec'd process(default: +## SUEXEC_UMASK: Defines umask for suEXEC'd process(default: ## unset) -## WITH_DEBUG: Build a debug versoin of apache (set CFLAGS +## WITH_DEBUG: Build a debug version of apache (set CFLAGS ## to "-O0 -g -ggdb3" or ${DEBUG_FLAGS} and ## defines WITH_EXCEPTION_HOOK too) ## WITH_EXCEPTION_HOOK: Enable fatal exception hook ## -## Optional patches: +## Optional patches without option: ## WITH_ITK_PERDIR_REGEX Add the per-directory setting AssignUserFromPath for mpm-itk ## as described on http://www.pvv.ntnu.no/~knuta/mpm-itk/ +## WITH_ITK_LIMITS Add rlimits based on login class for mpm-itk ## ## Available make targets: ## config: open the configure dialog @@ -61,16 +54,14 @@ ## show-modules: prints list of available modules ## ## Examples (*): -## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" WITH_EXPERIMENTAL_MODULES=yes +## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" ## Note: If you define your custom options in /etc/make.conf, don't forget ## to do not use quotes. ## -DOCSDIR= ${PREFIX}/share/doc/apache22 -EXAMPLESDIR= ${PREFIX}/share/examples/apache22 MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR} -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) MAKE_ENV+= NOPORTDOCS=yes .endif Modified: head/www/apache22/Makefile.modules ============================================================================== --- head/www/apache22/Makefile.modules Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.modules Sun Sep 2 14:31:58 2012 (r303550) @@ -1,61 +1,101 @@ -# Makefile.modules -# Author: Clement Laforet -# -# This file is used to build modules list, DBM dependencies and MPM selection. -# I hope it can easily handle external modules (such as mod_perl) or MPMs, like -# muxmpm. +# $FreeBSD$ # -# Note to myself: (to generate PLIST_SUB entries for modules) +# Note by Clement Laforet: (to generate PLIST_SUB entries for modules) # gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp # mv tmp pkg-plist # -# $FreeBSD$ -# + +# ============================================= +# Maintainer note for OPTION handling: +# To set additional option use +# PORT_OPTIONS+= +# To unset an OPTION, even the OPTION is set in OPTIONSFILE use +# WITHOUT_MODULES+= +# Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected +# if the OPTION is enabled by the user, therefore we calculate +# them in bsd.apache.mk with help of WITHOUT_MODULES +# The other methode is to set IGNORE's and force the user to adjust OPTIONS .if defined(_PREMKINCLUDED) + +# check if APR was build with thread support +.if exists(${APR_CONFIG}) +APR_LIBS!= ${SH} ${APR_CONFIG} --libs | ${SED} -e 's/-//g' +. if defined(APR_LIBS) && !empty(APR_LIBS) +_T=pthread +. for lib in ${APR_LIBS} +. if ${_T:M${lib}} +APR_HAS_THREADS= yes +. endif +. endfor +. endif +.endif # exists APR_CONFIG + +# check if APR-util module exists +.if exists(${APU_CONFIG}) +. if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MAUTHNZ_LDAP} +. if !exists(${APU_LDAP}) +IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\ + Please rebuild APR with LDAP support +. endif +. endif + +. if ${PORT_OPTIONS:MDBD} || ${PORT_OPTIONS:MAUTHN_DBD} +. if !exists(${APU_DBD_MYSQL}) && !exists(${APU_DBD_PGSQL}) && !exists(${APU_DBD_SQLITE3}) +IGNORE= AUTHN_DBD and DBD requires APR-util to have DBD support build in.\ + Please rebuild APR at last with one DBD backend +. endif +. endif +.endif # exists APU_CONFIG + # ============================================= # MPM's: prefork worker event itk peruser -.if ${WITH_MPM:L} == "prefork" +.if ${WITH_MPM} == "prefork" PLIST_SUB+= WORKER="@comment " EVENT="@comment " - -.elif ${WITH_MPM:L} == "worker" -PLIST_SUB+= WORKER="" EVENT="@comment " - -.elif ${WITH_MPM:L} == "event" +.elif ${WITH_MPM} == "worker" +PLIST_SUB+= WORKER="" EVENT="@comment " +.elif ${WITH_MPM} == "event" PLIST_SUB+= WORKER="@comment " EVENT="" - -.elif ${WITH_MPM:L} == "peruser" +.elif ${WITH_MPM} == "peruser" PLIST_SUB+= WORKER="@comment " EVENT="@comment " - -.elif ${WITH_MPM:L} == "itk" +.elif ${WITH_MPM} == "itk" PLIST_SUB+= WORKER="@comment " EVENT="@comment " EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-${MPM_ITK_VERSION} -. if defined (WITH_ITK_PERDIR_REGEX) -EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex -. endif - +. if defined (WITH_ITK_PERDIR_REGEX) && defined (WITH_ITK_LIMITS) +IGNORE= Use only one patch option not both (WITH_ITK_PERDIR_REGEX or WITH_ITK_LIMITS) +. endif +. if defined (WITH_ITK_PERDIR_REGEX) +EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex +. endif +. if defined (WITH_ITK_LIMITS) +EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-limits +. endif .else -IGNORE= "Unknown MPM: ${WITH_MPM}" +IGNORE= Unknown MPM: ${WITH_MPM} .endif # MPM prefork -.if ${WITH_MPM:L} != "prefork" -PKGNAMESUFFIX= -${WITH_MPM:L} -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +.if ${WITH_MPM} != "prefork" +PKGNAMESUFFIX= -${WITH_MPM}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm .endif -.if ${WITH_MPM:L} == "worker" || ${WITH_MPM:L} == "event" -WITH_THREADS= yes -WITH_MODULES+= CGID -WITHOUT_MODULES+= CGI +.if ${WITH_MPM} == "worker" || ${WITH_MPM} == "event" +PORT_OPTIONS+= CGID +.if ${PORT_OPTIONS:MCGI} +IGNORE= does not build with CGI. Please de-select CGI and select CGID instead +.endif +.if exists(${APR_CONFIG}) && !defined(APR_HAS_THREADS) +IGNORE= requires APR threads. Please rebuild APR with THREAD support +. endif .endif # ============================================= -# XXX WITH_STATIC_SUPPORT : make.conf, or command line parameter +# The next three params are not converted to an option, +# they should be used only for special builds. .if defined(WITH_STATIC_SUPPORT) CONFIGURE_ARGS+= --enable-static-support .endif -# XXX WITH_DEBUG : make.conf, or command line parameter # debug overrides CFLAGS .if defined(WITH_DEBUG) DEBUG_FLAGS?= -O0 -g -ggdb3 @@ -64,53 +104,57 @@ CONFIGURE_ARGS+= --enable-maintainer-mod WITH_EXCEPTION_HOOK= yes .endif -# WITH_EXCEPTION_HOOK: parameter for command line or make.conf .if defined(WITH_EXCEPTION_HOOK) CONFIGURE_ARGS+= --enable-exception-hook .endif -.if !defined(WITHOUT_SSL) +.if ${PORT_OPTIONS:MSSL} CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .endif -.if defined (WITH_AUTHNZ_LDAP) +.if ${PORT_OPTIONS:MAUTHNZ_LDAP} CONFIGURE_ARGS+= --enable-authnz-ldap .endif -.if defined (WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+= --enable-ldap=shared .endif -.if !defined(WITH_THREADS) -WITHOUT_MODULES+= MEM_CACHE -. if defined(WITH_MEM_CACHE) -IGNORE+= mod_mem_cache requires WITH_THREADS -. endif -.else -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +.if ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} +. if !${APACHE_MODULES:MAUTHN*} +IGNORE= AUTH_BASIC and AUTH_DIGEST need at last one AUTHN provider +. endif .endif -.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) -WITHOUT_MODULES+= AUTHN_DBD DBD -. if defined(WITH_DBD) || defined(WITH_AUTHN_DBD) -IGNORE+= You need to enable at least one DBD backend -. endif +.if ${PORT_OPTIONS:MAUTH_BASIC} +. if !${APACHE_MODULES:MAUTHZ*} +IGNORE= AUTH_BASIC need at last one AUTHZ provider +. endif +.endif + +.if defined(APR_HAS_THREADS) +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} +.else +. if exists(${APR_CONFIG}) && ${PORT_OPTIONS:MMEM_CACHE} +IGNORE= MEM_CACHE requires APR threads. Please rebuild APR with THREAD support +. endif .endif -.if defined(WITHOUT_IPV6) +.if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+= --disable-ipv6 .else CATEGORIES+= ipv6 -. if defined(WITH_IPV6_V6ONLY) || defined(WITHOUT_V4MAPPED) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-server__config.c +. if ${PORT_OPTIONS:MIPV6_V6ONLY} CONFIGURE_ARGS+= --disable-v4-mapped -. else +. else CONFIGURE_ARGS+= --enable-v4-mapped -. endif +. endif .endif -CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} +CONFIGURE_ARGS+= --with-mpm=${WITH_MPM} .endif # _PREMKINCLUDED Modified: head/www/apache22/Makefile.options ============================================================================== --- head/www/apache22/Makefile.options Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.options Sun Sep 2 14:31:58 2012 (r303550) @@ -1,7 +1,14 @@ # $FreeBSD$ -.if !defined(Module_inc) -Module_inc= done +# XXX The follwing params are used for special buils, +# they will be not converted to an OPTION. +# WITH_MPM # prefork worker event itk peruser +# WITH_STATIC_SUPPORT # used in make.conf +# WITH_DEBUG # used in make.conf or as build param +# WITH_EXCEPTION_HOOK # used in make.conf or as build param +# WITH_ITK_PERDIR_REGEX # => itk-mpm extra patch +# WITH_ITK_LIMITS # => itk-mpm extra patch +# AUTH_MODULES= AUTH_BASIC AUTH_DIGEST AUTHN_MODULES= AUTHN_FILE AUTHN_DBD AUTHN_DBM AUTHN_ANON AUTHN_DEFAULT \ @@ -12,108 +19,245 @@ CACHE_MODULES= CACHE DISK_CACHE FILE_CA DAV_MODULES= DAV DAV_FS EXPERIMENTAL_MODULES= BUCKETEER CASE_FILTER CASE_FILTER_IN EXT_FILTER \ LOG_FORENSIC OPTIONAL_HOOK_EXPORT OPTIONAL_HOOK_IMPORT \ - OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT + OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT LDAP_MODULES= LDAP AUTHNZ_LDAP -MISC_MODULES+= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ +MISC_MODULES= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ CGI CHARSET_LITE DBD DEFLATE DIR DUMPIO ENV EXPIRES \ HEADERS IMAGEMAP INCLUDE INFO LOG_CONFIG LOGIO MIME \ MIME_MAGIC NEGOTIATION REWRITE SETENVIF SPELING STATUS SUBSTITUTE \ UNIQUE_ID USERDIR USERTRACK VHOST_ALIAS FILTER VERSION REQTIMEOUT -PROXY_MODULES= PROXY PROXY_CONNECT PROXY_FTP PROXY_HTTP PROXY_AJP PROXY_BALANCER \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" From owner-freebsd-apache@FreeBSD.ORG Sun Sep 2 14:40:35 2012 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D88391065674 for ; Sun, 2 Sep 2012 14:40:35 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C03B88FC1E for ; Sun, 2 Sep 2012 14:40:35 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q82EeZ6G091038 for ; Sun, 2 Sep 2012 14:40:35 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q82EeZGR091025; Sun, 2 Sep 2012 14:40:35 GMT (envelope-from gnats) Date: Sun, 2 Sep 2012 14:40:35 GMT Message-Id: <201209021440.q82EeZGR091025@freefall.freebsd.org> To: apache@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/167965: commit references a PR X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 14:40:36 -0000 The following reply was made to PR ports/167965; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/167965: commit references a PR Date: Sun, 2 Sep 2012 14:32:14 +0000 (UTC) Author: ohauer Date: Sun Sep 2 14:31:58 2012 New Revision: 303550 URL: http://svn.freebsd.org/changeset/ports/303550 Log: devel/apr1 [1] - update APR to 1.4.6 - update APR-util to 1.4.1 - remove PKGNAMESUFFIX'es www/apache-(event|itk|peruser|worker)-mpm - adopt new Makefile header, adjust PKGNAMESUFFIX in apache22 masterport PKGNAME match now LATEST_LINK www/apache22 [2]-[6] - rewrite for options NG - PORTNAME s|apache|apache22| - remove APR APR-util specific otions, will be checked now with help of apr/u-1-config Mk/bsd.apache.mk - rewrite for options NG - remove no longer needet make targets (show-categories, make-options-list) [1] PR: 165143 [2]-[6] PR: 130479 PR: 153406 PR: 158565 PR: 168769 PR: 167965 with hat apache@ Added: head/www/apache22/files/extra-patch-server__config.c (contents, props changed) head/www/apache22/files/extra-patch-suexec_userdir (contents, props changed) head/www/apache22/files/mpm-itk-limits (contents, props changed) Deleted: head/devel/apr1/files/patch-apr_ldap_rebind.c Modified: head/Mk/bsd.apache.mk (contents, props changed) head/devel/apr1/Makefile (contents, props changed) head/devel/apr1/distinfo (contents, props changed) head/devel/apr1/files/patch-apr_hints.m4 (contents, props changed) head/devel/apr1/pkg-plist (contents, props changed) head/www/apache22-event-mpm/Makefile head/www/apache22-itk-mpm/Makefile head/www/apache22-peruser-mpm/Makefile head/www/apache22-worker-mpm/Makefile head/www/apache22/Makefile head/www/apache22/Makefile.doc (contents, props changed) head/www/apache22/Makefile.modules head/www/apache22/Makefile.options head/www/apache22/pkg-plist (contents, props changed) Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Sun Sep 2 14:16:18 2012 (r303549) +++ head/Mk/bsd.apache.mk Sun Sep 2 14:31:58 2012 (r303550) @@ -116,14 +116,6 @@ IGNORE= ${_ERROR_MSG} Illegal use of USE # =============================================================== .if defined(AP_PORT_IS_SERVER) # MFC TODO: remove this check -# used only in apache22-peruser-mpm, remved in rev. 253708 -# http://svnweb.freebsd.org/ports?view=revision&revision=253708 -# For slave ports: -.if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR} -IGNORE= Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync ${PORTVERSION} != ${SLAVE_DESIGNED_FOR} -.endif - -# MFC TODO: remove this check # used only by www/cakephp* ports .if defined(SLAVE_PORT_MODULES) DEFAULT_MODULES_CATEGORIES+= SLAVE_PORT @@ -139,23 +131,12 @@ DEFAULT_MODULES+= ${${category}_MODULE AVAILABLE_MODULES+= ${${category}_MODULES} .endfor -# == start convert param to UPPERCASE -# detect lowercase params in make.conf, users should them to UPPERCASE -# In near future we will throw an IGNORE message -#_ERROR_DLCM= ... detected (make.conf), please convert apache releated params to UPPERCASE -.if defined(WITH_MODULES) && ${WITH_MODULES:M[a-z]*} -#IGNNORE= lowercase WITH_MODULES= ${_ERROR_DLCM} -WITH_MODULES:=${WITH_MODULES:U} -.endif -.if defined(WITHOUT_MODULES) && ${WITHOUT_MODULES:M[a-z]*} -#IGNORE= lowercase WITHOUT_MODULES= ${_ERROR_DLCM} -WITHOUT_MODULES:=${WITHOUT_MODULES:U} -.endif +# detect invalid lowercase params in make.conf +# keep this check until end of 2012 .if defined(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M[a-z]*} -#IGNORE= lowercase WITH_STATIC_MODULES= ${_ERROR_DLCM} -WITH_STATIC_MODULES:=${WITH_STATIC_MODULES:U} +IGNORE= lowercase WITH_STATIC_MODULES="${WITH_STATIC_MODULES}"\ + detected (make.conf), they shoud be UPPERCASE .endif -# == end convert param to UPPERCASE # Setting "@comment " as default. .for module in ${AVAILABLE_MODULES:O} @@ -169,40 +150,38 @@ _DISABLE_MODULES+= --disable-${module:L CONFIGURE_ARGS+= ${_DISABLE_MODULES:O:u} .endif -.if ( defined(OPTIONS) || defined(OPTIONS_DEFINE) ) && !(make(make-options-list)) +# OPTIONS handling .for module in ${AVAILABLE_MODULES} -. if defined(WITH_${module}) +. if ${PORT_OPTIONS:M${module}} _APACHE_MODULES+= ${module} -. endif -. if defined(WITHOUT_${module}) +. else WITHOUT_MODULES+= ${module} . endif .endfor -.endif .if !defined(WITH_STATIC_APACHE) -. if ${USE_APACHE:Mcommon2*} != "" # FYI #DYNAMIC_MODULES= so CONFIGURE_ARGS+= --enable-so -. endif .else -. if ${USE_APACHE:Mcommon2*} != "" CONFIGURE_ARGS+= --disable-so -. endif WITH_ALL_STATIC_MODULES= yes .endif -.if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES) -. if ${USE_APACHE:Mcommon2*} != "" +.if ${PORT_OPTIONS:MSUEXEC} _APACHE_MODULES+= ${SUEXEC_MODULES} SUEXEC_CONFARGS= with-suexec -. endif -# From now we're defaulting to apache 2.* +# SUEXEC_DOCROOT should exist SUEXEC_DOCROOT?= ${PREFIX}/www/data +#SUEXEC_DOCROOT?= ${WWWDIR} SUEXEC_USERDIR?= public_html +# avoid duplicate search paths +.if ${LOCALBASE} == ${PREFIX} +SUEXEC_SAFEPATH?= ${LOCALBASE}/bin:/usr/bin:/bin +.else SUEXEC_SAFEPATH?= ${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin +.endif SUEXEC_LOGFILE?= /var/log/httpd-suexec.log SUEXEC_UIDMIN?= 1000 SUEXEC_GIDMIN?= 1000 @@ -213,10 +192,8 @@ CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-c --${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \ --${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \ --${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \ - --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" -. if ${USE_APACHE:Mcommon2*} != "" -CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec" -. endif + --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \ + --${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec" . if defined(WITH_SUEXEC_UMASK) CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK} @@ -249,6 +226,8 @@ CONFIGURE_ARGS+= --enable-modules="${APA CONFIGURE_ARGS+= --enable-mods-shared="${APACHE_MODULES:O:L}" .endif +# ==================================== +# start pkg-plist adjustments .if defined(WITH_STATIC_MODULES) .for module in ${APACHE_MODULES} . if !${WITH_STATIC_MODULES:M${module}} @@ -268,6 +247,22 @@ ${module}_PLIST_SUB= "" .for module in ${AVAILABLE_MODULES:O:u} PLIST_SUB+= MOD_${module}=${${module}_PLIST_SUB} .endfor + +# pkg-plist workaround STATIC support +.if ${PORT_OPTIONS:MSUEXEC} +PLIST_SUB+= SUEXEC="" +.else +PLIST_SUB+= SUEXEC="@comment " +.endif + +.if ${PORT_OPTIONS:MLOG_FORENSIC} +PLIST_SUB+= FORENSIC="" +.else +PLIST_SUB+= FORENSIC="@comment " +.endif + +# end pkg-plist adjustments + #### End of AP_PORT_IS_SERVER #### # =============================================================== @@ -409,6 +404,10 @@ IGNORE= ${_ERROR_MSG} specify only one o IGNORE= ${_ERROR_MSG} use USE_APACHE instead of USE_APACHE_BUILD and USE_APACHE_RUN together .endif +.if defined(NO_BUILD) && defined(USE_APACHE) +IGNORE= If NO_BUILD is used, then USE_APACHE_RUN is sufficient. Please fix your Makefile +.endif + .if defined(AP_PORT_IS_SERVER) .if !target(print-closest-mirrors) print-closest-mirrors: @@ -422,14 +421,6 @@ print-closest-mirrors: ${ECHO_MSG} "No mirrors found!">&2 ; fi .endif -.if !target(show-categories) -show-categories: -.for category in ${ALL_MODULES_CATEGORIES} - @${ECHO_MSG} "${category} contains these modules:" - @${ECHO_MSG} " ${${category}_MODULES}" -.endfor -.endif - .if !target(show-modules) show-modules: .for module in ${AVAILABLE_MODULES} @@ -447,19 +438,6 @@ show-modules: .endfor .endif -# MFC TODO: remove this target it's useless with options NG -.if !target(make-options-list) -make-options-list: - @${ECHO_CMD} OPTIONS+= \\; -.for module in ${AVAILABLE_MODULES} -. if ${APACHE_MODULES:M${module}} - @${ECHO} -e "\t ${module} \"mod_${module:L}\" on \\" -. else - @${ECHO} -e "\t ${module} \"mod_${module:L}\" off \\" -. endif -.endfor -.endif - .elif defined(AP_PORT_IS_MODULE) .if defined(AP_FAST_BUILD) Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -31,8 +31,8 @@ NDBM_DESC= NDBM support .include -APR_VERSION= 1.4.5 -APU_VERSION= 1.3.12 +APR_VERSION= 1.4.6 +APU_VERSION= 1.4.1 USE_ICONV= yes USE_AUTOTOOLS= automake autoconf libtool:env @@ -49,7 +49,7 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VER PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" SHLIB_APR_MAJOR= 4 -SHLIB_APU_MAJOR= 3 +SHLIB_APU_MAJOR= 4 APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ @@ -61,31 +61,16 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} APR_CONF_ARGS+= --enable-threads .else APR_CONF_ARGS+= --disable-threads -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr -. else -PKGNAMESUFFIX= -nothr -. endif .endif .if ${PORT_OPTIONS:MIPV6} APR_CONF_ARGS+= --enable-ipv6 -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6 -. else -PKGNAMESUFFIX= -ipv6 -. endif .else APR_CONF_ARGS+= --disable-ipv6 .endif .if ${PORT_OPTIONS:MDEVRANDOM} APR_CONF_ARGS+= --with-devrandom -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom -. else -PKGNAMESUFFIX= -devrandom -. endif .else APR_CONF_ARGS+= --without-devrandom .endif @@ -96,11 +81,6 @@ PLIST_SUB+= GDBM="" APU_EXTRAS= yes LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm -. else -PKGNAMESUFFIX= -gdbm -. endif .else PLIST_SUB+= GDBM="@comment " APU_CONF_ARGS+= --without-gdbm @@ -111,11 +91,6 @@ APU_EXTRAS= yes PLIST_SUB+= BDB="" USE_BDB= 42+ APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -. else -PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -. endif .else PLIST_SUB+= BDB="@comment " APU_CONF_ARGS+= --without-berkeley-db @@ -125,11 +100,6 @@ APU_CONF_ARGS+= --without-berkeley-db APU_EXTRAS= yes PLIST_SUB+= NDBM="" APU_CONF_ARGS+= --with-ndbm=/usr -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm -. else -PKGNAMESUFFIX= -ndbm -. endif .else PLIST_SUB+= NDBM="@comment " APU_CONF_ARGS+= --without-ndbm @@ -141,11 +111,6 @@ PLIST_SUB+= LDAP="" USE_OPENLDAP= yes APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER} -. else -PKGNAMESUFFIX= -ldap -. endif .else PLIST_SUB+= LDAP="@comment " APU_CONF_ARGS+= --without-ldap @@ -159,11 +124,6 @@ APU_CONF_ARGS+= --with-mysql=${LOCALBASE CONFIGURE_ENV+= LIBS="${LIBS}" CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H LDFLAGS+= -L${LOCALBASE}/lib/mysql -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER} -. else -PKGNAMESUFFIX= -mysql -. endif .else PLIST_SUB+= MYSQL="@comment " APU_CONF_ARGS+= --without-mysql @@ -175,11 +135,6 @@ PLIST_SUB+= PGSQL="" USE_PGSQL= YES APU_CONF_ARGS+= --with-pgsql=${LOCALBASE} CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG="" -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER} -. else -PKGNAMESUFFIX= -pgsql -. endif .else PLIST_SUB+= PGSQL="@comment " APU_CONF_ARGS+= --without-pgsql @@ -190,11 +145,6 @@ APU_EXTRAS= yes PLIST_SUB+= SQLITE3="" USE_SQLITE= YES APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE} -. if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3 -. else -PKGNAMESUFFIX= -sqlite3 -. endif .else APU_CONF_ARGS+= --without-sqlite3 PLIST_SUB+= SQLITE3="@comment " @@ -218,6 +168,9 @@ post-patch: ${APR_WRKDIR}/build/gen-build.py ${REINPLACE_CMD} -e 's/void main/int main/' ${APR_WRKDIR}/build/apr_network.m4 +# http://svn.apache.org/viewvc?view=revision&revision=1362895 + ${REINPLACE_CMD} -e 's|sql = apr_palloc|sql = apr_pcalloc|' ${APU_WRKDIR}/dbd/apr_dbd_freetds.c + run-autotools:: cd ${APR_WRKDIR} ; \ ${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf @@ -248,8 +201,8 @@ do-install: cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} test: build - @(cd ${APR_WRKDIR}; ${MAKE} test) - @(cd ${APU_WRKDIR}; ${MAKE} test) + -@(cd ${APR_WRKDIR}; ${MAKE} test) + -@(cd ${APU_WRKDIR}; ${MAKE} test) #regression-test: test Modified: head/devel/apr1/distinfo ============================================================================== --- head/devel/apr1/distinfo Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/distinfo Sun Sep 2 14:31:58 2012 (r303550) @@ -1,4 +1,4 @@ -SHA256 (apr-1.4.5.tar.gz) = 7323d5f72d6bddf7d1ecb63e4326df82a66210018bb2f1e8f6d97357e68302df -SIZE (apr-1.4.5.tar.gz) = 994320 -SHA256 (apr-util-1.3.12.tar.gz) = 815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8 -SIZE (apr-util-1.3.12.tar.gz) = 769076 +SHA256 (apr-1.4.6.tar.gz) = 538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05 +SIZE (apr-1.4.6.tar.gz) = 982243 +SHA256 (apr-util-1.4.1.tar.gz) = d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c +SIZE (apr-util-1.4.1.tar.gz) = 774770 Modified: head/devel/apr1/files/patch-apr_hints.m4 ============================================================================== --- head/devel/apr1/files/patch-apr_hints.m4 Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/files/patch-apr_hints.m4 Sun Sep 2 14:31:58 2012 (r303550) @@ -1,5 +1,5 @@ ---- apr-1.4.5/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 -+++ apr-1.4.5/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +--- apr-1.4.6/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.4.6/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 @@ -159,11 +159,7 @@ ;; *-freebsd*) Modified: head/devel/apr1/pkg-plist ============================================================================== --- head/devel/apr1/pkg-plist Sun Sep 2 14:16:18 2012 (r303549) +++ head/devel/apr1/pkg-plist Sun Sep 2 14:31:58 2012 (r303550) @@ -6,6 +6,7 @@ include/apr-1/apr_anylock.h include/apr-1/apr_atomic.h include/apr-1/apr_base64.h include/apr-1/apr_buckets.h +include/apr-1/apr_crypto.h include/apr-1/apr_date.h include/apr-1/apr_dbd.h include/apr-1/apr_dbm.h @@ -65,6 +66,7 @@ include/apr-1/apr_want.h include/apr-1/apr_xlate.h include/apr-1/apr_xml.h include/apr-1/apu.h +include/apr-1/apu_errno.h include/apr-1/apu_version.h include/apr-1/apu_want.h %%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so Modified: head/www/apache22-event-mpm/Makefile ============================================================================== --- head/www/apache22-event-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-event-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,10 +1,4 @@ -# New ports collection makefile for: apache22-event-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ -# - MASTERDIR= ${.CURDIR}/../apache22 @@ -12,7 +6,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= event -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22-itk-mpm/Makefile ============================================================================== --- head/www/apache22-itk-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-itk-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,12 +1,14 @@ -# New ports collection makefile for: apache22-itk-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ # # To build this port with the additional mpm-itk-perdir-regex # patch use -DWITH_ITK_PERDIR_REGEX # +# To build this port with the additional mpm-itk-limits +# patch use -DWITH_ITK_LIMITS +# +# Note: +# It's not possible to use both patches together +#´ # For a quick description take a look into the mpm-itk* patches # in the apache22/files directory @@ -16,7 +18,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= itk -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22-peruser-mpm/Makefile ============================================================================== --- head/www/apache22-peruser-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-peruser-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,13 +1,9 @@ -# New ports collection makefile for: apache22-peruser-mpm +# $FreeBSD$ +# # Apache 2.2.X with peruser mpm 0.3.0-dc3 -# Date created: 13 Sep 2008 -# Whom: Jille Timmermans # Peruser main url: http://telana.com/peruser.php # Peruser patches: http://source.kood.ee/ # This port contains the main patch, including the dc3 patch -# -# $FreeBSD$ -# MASTERDIR= ${.CURDIR}/../apache22 @@ -15,7 +11,7 @@ MAINTAINER= jille@quis.cx WITH_MPM= peruser -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch Modified: head/www/apache22-worker-mpm/Makefile ============================================================================== --- head/www/apache22-worker-mpm/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22-worker-mpm/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,10 +1,4 @@ -# New ports collection makefile for: apache22-worker-mpm -# Date created: 2010-11-5 -# Whom: Tom Judge -# # $FreeBSD$ -# - MASTERDIR= ${.CURDIR}/../apache22 @@ -12,7 +6,7 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= worker -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr .include "${MASTERDIR}/Makefile" Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile Sun Sep 2 14:31:58 2012 (r303550) @@ -1,22 +1,15 @@ -# New ports collection makefile for: apache22 -# Date created: Dec 11 2004 -# Whom: Clement Laforet -# # $FreeBSD$ -# -# For more information, please read Makefile.doc -# -PORTNAME= apache +PORTNAME= apache22 PORTVERSION= 2.2.22 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} DIST_SUBDIR= apache22 MAINTAINER?= apache@FreeBSD.org -COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM:L} MPM. +COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM} MPM. LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ apr-1:${PORTSDIR}/devel/apr1 \ @@ -24,14 +17,11 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ MAKE_JOBS_SAFE= yes -# to be removed if port is renamed to apache22 -ETCDIR= ${PREFIX}/etc/${PORTNAME}22 -WWWDIR= ${PREFIX}/www/${PORTNAME}22 LATEST_LINK?= apache22 CONFLICTS= caudium14-1.* \ apache-2.0.* apache-*-2.0.* \ - apache-*-2.2.* + apache-*-2.2.* apache22-*-2.2.* USE_APACHE= common22 USE_BZIP2= yes @@ -58,8 +48,17 @@ MPM_ITK_VERSION?= 20110321-01 .include "${APACHEDIR}/Makefile.options" .include +.include "${APACHEDIR}/Makefile.doc" + +APR_CONFIG?= ${LOCALBASE}/bin/apr-1-config +APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config -APU_CONFIG?= ${LOCALBASE}/bin/apu-1-config +# APU modules used by AUTHN_DBD DBD +APU_DBD_MYSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_mysql.so +APU_DBD_PGSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_pgsql.so +APU_DBD_SQLITE3?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_sqlite3.so +# APU module used by AUTHNZ_LDAP LDAP +APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --enable-layout=FreeBSD \ @@ -69,7 +68,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDES --with-iconv=${LOCALBASE} \ --enable-http \ --with-pcre=${LOCALBASE} \ - --with-apr=${LOCALBASE}/bin/apr-1-config \ + --with-apr=${APR_CONFIG} \ --with-apr-util=${APU_CONFIG} CONFIGURE_ENV= \ @@ -81,54 +80,36 @@ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},, MAKE_ENV+= EXPR_COMPAT=yes \ INSTALL_MAN="${INSTALL_MAN}" -# ============================================= +#===================================================== # CONFIGURE_ARGS willl be handled in Makefile.modules, # here we do only OPTIONS fixups -.if defined(WITH_SUEXEC_RSRCLIMIT) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit -.if !defined(WITH_SUEXEC) -IGNORE= suEXEC resource limit patch requires mod_suexec.\ - Please (re)run 'make config' and choose SUEXEC option also -.endif -.endif - -.if !defined(WITHOUT_SSL) +.if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes -WITH_MODULES+= SSL -.endif - -.if defined(WITH_AUTHNZ_LDAP) -WITH_LDAP= yes .endif -.if defined (WITH_LDAP) -USE_OPENLDAP= yes -WITH_AUTHNZ_LDAP=yes -.endif - -.if defined(WITH_MYSQL) -USE_MYSQL= yes -WITH_THREADS= yes -.endif - -.if defined(WITH_PGSQL) -USE_PGSQL= yes +.if ${PORT_OPTIONS:MSUEXEC_RSRCLIMIT} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_rsrclimit +. if empty(PORT_OPTIONS:MSUEXEC) +IGNORE= suEXEC resource limit patch requires mod_suexec.\ + Please (re)run 'make config' and choose SUEXEC option also +. endif .endif -.if defined(WITH_SQLITE) -USE_SQLITE= yes +.if ${PORT_OPTIONS:MSUEXEC_USERDIR} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_userdir +. if empty(PORT_OPTIONS:MSUEXEC) +IGNORE= suEXEC UserDir patch requires mod_suexec.\ + Please (re)run 'make config' and choose SUEXEC option also +. endif .endif -.include "${APACHEDIR}/Makefile.doc" .include .include "${APACHEDIR}/Makefile.modules" -pre-everything:: +pre-configure:: @${ECHO_MSG} "" @${ECHO_MSG} " You can check your modules configuration by using make show-modules" - @${ECHO_MSG} " To see all available knobs, type make show-options" - @${ECHO_MSG} " To see all modules in different categories, type make show-categories" @${ECHO_MSG} "" show-options: @@ -146,19 +127,28 @@ post-configure: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std post-install: - @${MKDIR} ${PREFIX}/etc/apache22/envvars.d - @${MKDIR} ${PREFIX}/etc/apache22/Includes - @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${PREFIX}/etc/apache22/Includes + @${MKDIR} ${ETCDIR}/envvars.d + @${MKDIR} ${ETCDIR}/Includes + @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${ETCDIR}/Includes/ -.if defined(WITH_LOG_FORENSIC) +.if ${PORT_OPTIONS:MLOG_FORENSIC} @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${PREFIX}/sbin .endif -.if !defined(NOPORTDOCS) -.for dir in style/lang style/xsl/util style/xsl +.if ${PORT_OPTIONS:MDOCS} +. for dir in style/lang style/xsl/util style/xsl @[ -d ${DOCSDIR}/${dir}/ ] && ${TOUCH} ${DOCSDIR}/${dir}/.keepme -.endfor +. endfor .endif @${CAT} ${PKGMESSAGE} +# maintainer only, check for new modules +modlist: extract + @${AWK} '/: checking whether to enable mod_/ \ + {printf "%%%%%s%%%%libexec/apache22/%s.so\n", \ + toupper($$8), $$8}' ${WRKSRC}/configure \ + | ${TR} -d '"' \ + | ${GREP} -E -v 'MOD_(ECHO|EXAMPLE|HTTP|IDENT|ISAPI|SO)' \ + | ${SORT} -u + .include Modified: head/www/apache22/Makefile.doc ============================================================================== --- head/www/apache22/Makefile.doc Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.doc Sun Sep 2 14:31:58 2012 (r303550) @@ -1,13 +1,7 @@ -# Makefile.doc -# Author: Clement Laforet -# -# This files contains: -# - make options output -# - apache22 man/docs routines -# # $FreeBSD$ # - +# Author: Clement Laforet +# ## ## By default, modules are compiled as dynamically loadable modules (DSO). ## @@ -21,11 +15,9 @@ ## event ## itk ## WITH_HTTP_PORT: default: 80 -## WITHOUT_V4MAPPED -## WITH_IPV6_V6ONLY: Don't allow IPv6 sockets to handle IPv4 -## connections +## ## WITH_STATIC_SUPPORT: Build statically linked support binaries -## WITH_STATIC_APACHE: Build a static version of httpd (implies +## WITH_STATIC_APACHE: Build a static version of httpd (implies ## WITH_STATIC_MODULES) ## WITH_ALL_STATIC_MODULES: All modules will be statically linked. ## WITH_STATIC_MODULES (*): List of modules to build modules statics @@ -34,25 +26,26 @@ ## WITH_MODULES or with default configuration ## use 'make show-modules', to check if they are ## enabled) -## WITH_SUEXEC: Enable suExec support -## SUEXEC_DOCROOT: SuExec root directory +## WITH_SUEXEC: Enable suEXEC support +## SUEXEC_DOCROOT: suEXEC root directory ## SUEXEC_USERDIR: User subdirectory (default public_html) ## SUEXEC_SAFEPATH: Set the safepath -## SUEXEC_LOGFILE: Set log file for suexec (default: /var/log/httpd-suexec.log) +## SUEXEC_LOGFILE: Set log file for suEXEC (default: /var/log/httpd-suexec.log) ## SUEXEC_UIDMIN: Minimal allowed UID (default 1000) ## SUEXEC_GIDMIN: Minimal allowed GID (default 1000) -## SUEXEC_CALLER: User allowed to call SuExec (default +## SUEXEC_CALLER: User allowed to call suEXEC (default ## ${WWWOWN} (www)) -## SUEXEC_UMASK: Defines umask for suexec'd process(default: +## SUEXEC_UMASK: Defines umask for suEXEC'd process(default: ## unset) -## WITH_DEBUG: Build a debug versoin of apache (set CFLAGS +## WITH_DEBUG: Build a debug version of apache (set CFLAGS ## to "-O0 -g -ggdb3" or ${DEBUG_FLAGS} and ## defines WITH_EXCEPTION_HOOK too) ## WITH_EXCEPTION_HOOK: Enable fatal exception hook ## -## Optional patches: +## Optional patches without option: ## WITH_ITK_PERDIR_REGEX Add the per-directory setting AssignUserFromPath for mpm-itk ## as described on http://www.pvv.ntnu.no/~knuta/mpm-itk/ +## WITH_ITK_LIMITS Add rlimits based on login class for mpm-itk ## ## Available make targets: ## config: open the configure dialog @@ -61,16 +54,14 @@ ## show-modules: prints list of available modules ## ## Examples (*): -## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" WITH_EXPERIMENTAL_MODULES=yes +## make WITH_STATIC_MODULES="SSL REWRITE INCLUDE" ## Note: If you define your custom options in /etc/make.conf, don't forget ## to do not use quotes. ## -DOCSDIR= ${PREFIX}/share/doc/apache22 -EXAMPLESDIR= ${PREFIX}/share/examples/apache22 MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR} -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) MAKE_ENV+= NOPORTDOCS=yes .endif Modified: head/www/apache22/Makefile.modules ============================================================================== --- head/www/apache22/Makefile.modules Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.modules Sun Sep 2 14:31:58 2012 (r303550) @@ -1,61 +1,101 @@ -# Makefile.modules -# Author: Clement Laforet -# -# This file is used to build modules list, DBM dependencies and MPM selection. -# I hope it can easily handle external modules (such as mod_perl) or MPMs, like -# muxmpm. +# $FreeBSD$ # -# Note to myself: (to generate PLIST_SUB entries for modules) +# Note by Clement Laforet: (to generate PLIST_SUB entries for modules) # gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp # mv tmp pkg-plist # -# $FreeBSD$ -# + +# ============================================= +# Maintainer note for OPTION handling: +# To set additional option use +# PORT_OPTIONS+= +# To unset an OPTION, even the OPTION is set in OPTIONSFILE use +# WITHOUT_MODULES+= +# Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected +# if the OPTION is enabled by the user, therefore we calculate +# them in bsd.apache.mk with help of WITHOUT_MODULES +# The other methode is to set IGNORE's and force the user to adjust OPTIONS .if defined(_PREMKINCLUDED) + +# check if APR was build with thread support +.if exists(${APR_CONFIG}) +APR_LIBS!= ${SH} ${APR_CONFIG} --libs | ${SED} -e 's/-//g' +. if defined(APR_LIBS) && !empty(APR_LIBS) +_T=pthread +. for lib in ${APR_LIBS} +. if ${_T:M${lib}} +APR_HAS_THREADS= yes +. endif +. endfor +. endif +.endif # exists APR_CONFIG + +# check if APR-util module exists +.if exists(${APU_CONFIG}) +. if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MAUTHNZ_LDAP} +. if !exists(${APU_LDAP}) +IGNORE= LDAP and AUTHNZ_LDAP requires APR-util to have LDAP support built in.\ + Please rebuild APR with LDAP support +. endif +. endif + +. if ${PORT_OPTIONS:MDBD} || ${PORT_OPTIONS:MAUTHN_DBD} +. if !exists(${APU_DBD_MYSQL}) && !exists(${APU_DBD_PGSQL}) && !exists(${APU_DBD_SQLITE3}) +IGNORE= AUTHN_DBD and DBD requires APR-util to have DBD support build in.\ + Please rebuild APR at last with one DBD backend +. endif +. endif +.endif # exists APU_CONFIG + # ============================================= # MPM's: prefork worker event itk peruser -.if ${WITH_MPM:L} == "prefork" +.if ${WITH_MPM} == "prefork" PLIST_SUB+= WORKER="@comment " EVENT="@comment " - -.elif ${WITH_MPM:L} == "worker" -PLIST_SUB+= WORKER="" EVENT="@comment " - -.elif ${WITH_MPM:L} == "event" +.elif ${WITH_MPM} == "worker" +PLIST_SUB+= WORKER="" EVENT="@comment " +.elif ${WITH_MPM} == "event" PLIST_SUB+= WORKER="@comment " EVENT="" - -.elif ${WITH_MPM:L} == "peruser" +.elif ${WITH_MPM} == "peruser" PLIST_SUB+= WORKER="@comment " EVENT="@comment " - -.elif ${WITH_MPM:L} == "itk" +.elif ${WITH_MPM} == "itk" PLIST_SUB+= WORKER="@comment " EVENT="@comment " EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-${MPM_ITK_VERSION} -. if defined (WITH_ITK_PERDIR_REGEX) -EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex -. endif - +. if defined (WITH_ITK_PERDIR_REGEX) && defined (WITH_ITK_LIMITS) +IGNORE= Use only one patch option not both (WITH_ITK_PERDIR_REGEX or WITH_ITK_LIMITS) +. endif +. if defined (WITH_ITK_PERDIR_REGEX) +EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex +. endif +. if defined (WITH_ITK_LIMITS) +EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-limits +. endif .else -IGNORE= "Unknown MPM: ${WITH_MPM}" +IGNORE= Unknown MPM: ${WITH_MPM} .endif # MPM prefork -.if ${WITH_MPM:L} != "prefork" -PKGNAMESUFFIX= -${WITH_MPM:L} -LATEST_LINK= apache22-${WITH_MPM:L}-mpm +.if ${WITH_MPM} != "prefork" +PKGNAMESUFFIX= -${WITH_MPM}-mpm +LATEST_LINK= apache22-${WITH_MPM}-mpm .endif -.if ${WITH_MPM:L} == "worker" || ${WITH_MPM:L} == "event" -WITH_THREADS= yes -WITH_MODULES+= CGID -WITHOUT_MODULES+= CGI +.if ${WITH_MPM} == "worker" || ${WITH_MPM} == "event" +PORT_OPTIONS+= CGID +.if ${PORT_OPTIONS:MCGI} +IGNORE= does not build with CGI. Please de-select CGI and select CGID instead +.endif +.if exists(${APR_CONFIG}) && !defined(APR_HAS_THREADS) +IGNORE= requires APR threads. Please rebuild APR with THREAD support +. endif .endif # ============================================= -# XXX WITH_STATIC_SUPPORT : make.conf, or command line parameter +# The next three params are not converted to an option, +# they should be used only for special builds. .if defined(WITH_STATIC_SUPPORT) CONFIGURE_ARGS+= --enable-static-support .endif -# XXX WITH_DEBUG : make.conf, or command line parameter # debug overrides CFLAGS .if defined(WITH_DEBUG) DEBUG_FLAGS?= -O0 -g -ggdb3 @@ -64,53 +104,57 @@ CONFIGURE_ARGS+= --enable-maintainer-mod WITH_EXCEPTION_HOOK= yes .endif -# WITH_EXCEPTION_HOOK: parameter for command line or make.conf .if defined(WITH_EXCEPTION_HOOK) CONFIGURE_ARGS+= --enable-exception-hook .endif -.if !defined(WITHOUT_SSL) +.if ${PORT_OPTIONS:MSSL} CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .endif -.if defined (WITH_AUTHNZ_LDAP) +.if ${PORT_OPTIONS:MAUTHNZ_LDAP} CONFIGURE_ARGS+= --enable-authnz-ldap .endif -.if defined (WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+= --enable-ldap=shared .endif -.if !defined(WITH_THREADS) -WITHOUT_MODULES+= MEM_CACHE -. if defined(WITH_MEM_CACHE) -IGNORE+= mod_mem_cache requires WITH_THREADS -. endif -.else -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +.if ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST} +. if !${APACHE_MODULES:MAUTHN*} +IGNORE= AUTH_BASIC and AUTH_DIGEST need at last one AUTHN provider +. endif .endif -.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) -WITHOUT_MODULES+= AUTHN_DBD DBD -. if defined(WITH_DBD) || defined(WITH_AUTHN_DBD) -IGNORE+= You need to enable at least one DBD backend -. endif +.if ${PORT_OPTIONS:MAUTH_BASIC} +. if !${APACHE_MODULES:MAUTHZ*} +IGNORE= AUTH_BASIC need at last one AUTHZ provider +. endif +.endif + +.if defined(APR_HAS_THREADS) +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} +.else +. if exists(${APR_CONFIG}) && ${PORT_OPTIONS:MMEM_CACHE} +IGNORE= MEM_CACHE requires APR threads. Please rebuild APR with THREAD support +. endif .endif -.if defined(WITHOUT_IPV6) +.if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+= --disable-ipv6 .else CATEGORIES+= ipv6 -. if defined(WITH_IPV6_V6ONLY) || defined(WITHOUT_V4MAPPED) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-server__config.c +. if ${PORT_OPTIONS:MIPV6_V6ONLY} CONFIGURE_ARGS+= --disable-v4-mapped -. else +. else CONFIGURE_ARGS+= --enable-v4-mapped -. endif +. endif .endif -CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} +CONFIGURE_ARGS+= --with-mpm=${WITH_MPM} .endif # _PREMKINCLUDED Modified: head/www/apache22/Makefile.options ============================================================================== --- head/www/apache22/Makefile.options Sun Sep 2 14:16:18 2012 (r303549) +++ head/www/apache22/Makefile.options Sun Sep 2 14:31:58 2012 (r303550) @@ -1,7 +1,14 @@ # $FreeBSD$ -.if !defined(Module_inc) -Module_inc= done +# XXX The follwing params are used for special buils, +# they will be not converted to an OPTION. +# WITH_MPM # prefork worker event itk peruser +# WITH_STATIC_SUPPORT # used in make.conf +# WITH_DEBUG # used in make.conf or as build param +# WITH_EXCEPTION_HOOK # used in make.conf or as build param +# WITH_ITK_PERDIR_REGEX # => itk-mpm extra patch +# WITH_ITK_LIMITS # => itk-mpm extra patch +# AUTH_MODULES= AUTH_BASIC AUTH_DIGEST AUTHN_MODULES= AUTHN_FILE AUTHN_DBD AUTHN_DBM AUTHN_ANON AUTHN_DEFAULT \ @@ -12,108 +19,245 @@ CACHE_MODULES= CACHE DISK_CACHE FILE_CA DAV_MODULES= DAV DAV_FS EXPERIMENTAL_MODULES= BUCKETEER CASE_FILTER CASE_FILTER_IN EXT_FILTER \ LOG_FORENSIC OPTIONAL_HOOK_EXPORT OPTIONAL_HOOK_IMPORT \ - OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT + OPTIONAL_FN_IMPORT OPTIONAL_FN_EXPORT LDAP_MODULES= LDAP AUTHNZ_LDAP -MISC_MODULES+= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ +MISC_MODULES= ACTIONS ALIAS ASIS AUTOINDEX CERN_META \ CGI CHARSET_LITE DBD DEFLATE DIR DUMPIO ENV EXPIRES \ HEADERS IMAGEMAP INCLUDE INFO LOG_CONFIG LOGIO MIME \ MIME_MAGIC NEGOTIATION REWRITE SETENVIF SPELING STATUS SUBSTITUTE \ UNIQUE_ID USERDIR USERTRACK VHOST_ALIAS FILTER VERSION REQTIMEOUT -PROXY_MODULES= PROXY PROXY_CONNECT PROXY_FTP PROXY_HTTP PROXY_AJP PROXY_BALANCER \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" From owner-freebsd-apache@FreeBSD.ORG Sun Sep 2 14:46:52 2012 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1CCB1065782; Sun, 2 Sep 2012 14:46:52 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B4CE38FC12; Sun, 2 Sep 2012 14:46:52 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q82EkqF5018514; Sun, 2 Sep 2012 14:46:52 GMT (envelope-from ohauer@freefall.freebsd.org) Received: (from ohauer@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q82EkqEO018492; Sun, 2 Sep 2012 14:46:52 GMT (envelope-from ohauer) Date: Sun, 2 Sep 2012 14:46:52 GMT Message-Id: <201209021446.q82EkqEO018492@freefall.freebsd.org> To: pgollucci@p6m7g8.com, ohauer@FreeBSD.org, apache@FreeBSD.org From: ohauer@FreeBSD.org Cc: Subject: Re: ports/165143: [exp-run] [patch] devel/apr: CVE / Update / exp-run / shlib bump X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 14:46:53 -0000 Synopsis: [exp-run] [patch] devel/apr: CVE / Update / exp-run / shlib bump State-Changed-From-To: open->closed State-Changed-By: ohauer State-Changed-When: Sun Sep 2 14:46:08 UTC 2012 State-Changed-Why: Committed, Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=165143 From owner-freebsd-apache@FreeBSD.ORG Sun Sep 2 14:50:57 2012 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CFD6106566B; Sun, 2 Sep 2012 14:50:57 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 501268FC0A; Sun, 2 Sep 2012 14:50:57 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q82EovFQ091476; Sun, 2 Sep 2012 14:50:57 GMT (envelope-from ohauer@freefall.freebsd.org) Received: (from ohauer@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q82EovSY091460; Sun, 2 Sep 2012 14:50:57 GMT (envelope-from ohauer) Date: Sun, 2 Sep 2012 14:50:57 GMT Message-Id: <201209021450.q82EovSY091460@freefall.freebsd.org> To: pgollucci@freebsd.org, ohauer@FreeBSD.org, apache@FreeBSD.org From: ohauer@FreeBSD.org Cc: Subject: Re: ports/130479: www/apache22 configure_args busted X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 14:50:57 -0000 Synopsis: www/apache22 configure_args busted State-Changed-From-To: open->closed State-Changed-By: ohauer State-Changed-When: Sun Sep 2 14:47:21 UTC 2012 State-Changed-Why: apache does not use bundled APR anymore. apache port do now check build with help of apr/u-1-config and detects if APR/APR-util was build with LDAP DBD ... support. http://www.freebsd.org/cgi/query-pr.cgi?pr=130479 From owner-freebsd-apache@FreeBSD.ORG Sun Sep 2 15:02:28 2012 Return-Path: Delivered-To: apache@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8F850106566C; Sun, 2 Sep 2012 15:02:28 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6324E8FC14; Sun, 2 Sep 2012 15:02:28 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q82F2SeZ026028; Sun, 2 Sep 2012 15:02:28 GMT (envelope-from ohauer@freefall.freebsd.org) Received: (from ohauer@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q82F2Rqd025914; Sun, 2 Sep 2012 15:02:27 GMT (envelope-from ohauer) Date: Sun, 2 Sep 2012 15:02:27 GMT Message-Id: <201209021502.q82F2Rqd025914@freefall.freebsd.org> To: ln@ruweb.net, ohauer@FreeBSD.org, apache@FreeBSD.org From: ohauer@FreeBSD.org Cc: Subject: Re: ports/167965: if to make port (www/apache22) with an option: WITH_ALL_STATIC_MODULES=yes, suexec won't belong to this port. X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2012 15:02:28 -0000 Synopsis: if to make port (www/apache22) with an option: WITH_ALL_STATIC_MODULES=yes, suexec won't belong to this port. State-Changed-From-To: open->closed State-Changed-By: ohauer State-Changed-When: Sun Sep 2 14:54:43 UTC 2012 State-Changed-Why: Fixed in PORTREVISION 7 btw: SUEXEC_DOCROOT should not end with / (SUEXEC_DOCROOT=/home/) Thanks for the report! http://www.freebsd.org/cgi/query-pr.cgi?pr=167965 From owner-freebsd-apache@FreeBSD.ORG Mon Sep 3 11:06:49 2012 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D33F106566C for ; Mon, 3 Sep 2012 11:06:49 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 57BE38FC16 for ; Mon, 3 Sep 2012 11:06:49 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q83B6nPK014878 for ; Mon, 3 Sep 2012 11:06:49 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q83B6lDH014512 for apache@FreeBSD.org; Mon, 3 Sep 2012 11:06:47 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 3 Sep 2012 11:06:47 GMT Message-Id: <201209031106.q83B6lDH014512@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: apache@FreeBSD.org Cc: Subject: Current problem reports assigned to apache@FreeBSD.org X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2012 11:06:49 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- f ports/171210 apache [patch] www/mod_rivet -- DIO requires itcl o ports/165809 apache add mod_proxy patch to www/apache22 o ports/157554 apache www/apache22: Apache RLimitNPROC does not work as inte o ports/156787 apache www/mod_auth_kerb2 fails on undefined symbol with base o ports/147282 apache errors when starting www/apache22 after installation o o ports/137729 apache www/mod_auth_kerb2 port broken on 8.0-BETA2 due to sec o ports/125183 apache www/apache22 wrong SUEXEC_DOCROOT o ports/124375 apache security/heimdal: www/mod_auth_kerb doesn't compile ag 8 problems total. From owner-freebsd-apache@FreeBSD.ORG Tue Sep 4 02:47:50 2012 Return-Path: Delivered-To: freebsd-apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 32B971065688 for ; Tue, 4 Sep 2012 02:47:50 +0000 (UTC) (envelope-from 31WtFUAgHDko9A_m6pu0DEI.o0yr3qqn4p-m1motqr3qqn4p.03s@photos-server.bounces.google.com) Received: from mail-pb0-f74.google.com (mail-pb0-f74.google.com [209.85.160.74]) by mx1.freebsd.org (Postfix) with ESMTP id 0E81F8FC12 for ; Tue, 4 Sep 2012 02:47:50 +0000 (UTC) Received: by mail-pb0-f74.google.com with SMTP id rp2so470897pbb.1 for ; Mon, 03 Sep 2012 19:47:50 -0700 (PDT) MIME-Version: 1.0 Received: by 10.66.72.73 with SMTP id b9mt9245298pav.9.1346726869936; Mon, 03 Sep 2012 19:47:49 -0700 (PDT) Message-ID: Date: Tue, 04 Sep 2012 02:47:49 +0000 From: xingyao wu To: freebsd-apache@freebsd.org Content-Type: multipart/mixed; boundary=f46d042fda08b1f44d04c8d74893 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: xingyao wu shared photos with you X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: xingyao wu List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 02:47:50 -0000 --f46d042fda08b1f44d04c8d74893 Content-Type: text/plain; charset=ISO-8859-1; format=flowed; delsp=yes Hello my Friend How are you? We have JBL speakers, YAMAHA amplifier,SHURE microphones, DBX equalizer. . . If you are interested in our products, please contact us, we can send the price list to you, we can give you the lowest price, best quality. We will make you satisfied. Thank you I wish you happy every day! Meiling --f46d042fda08b1f44d04c8d74893-- From owner-freebsd-apache@FreeBSD.ORG Tue Sep 4 20:35:09 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31B0B106566B; Tue, 4 Sep 2012 20:35:09 +0000 (UTC) (envelope-from mike.jakubik@intertainservices.com) Received: from mail.intertainservices.com (mail.intertainservices.com [69.77.177.114]) by mx1.freebsd.org (Postfix) with ESMTP id 045138FC0C; Tue, 4 Sep 2012 20:35:08 +0000 (UTC) Received: from [172.16.10.200] (unknown [172.16.10.200]) by mail.intertainservices.com (Postfix) with ESMTPSA id 726A056D91; Tue, 4 Sep 2012 16:29:38 -0400 (EDT) Message-ID: <1346790578.1456.44.camel@mjakubik.localdomain> From: Mike Jakubik To: Olli Hauer Date: Tue, 04 Sep 2012 16:29:38 -0400 In-Reply-To: <50431591.5040406@FreeBSD.org> References: <1346543324.15749@da3m0n8t3r.com> <50431591.5040406@FreeBSD.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.3 (3.4.3-2.fc17) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-intertainservices-MailScanner-Information: Please contact the ISP for more information X-intertainservices-MailScanner-ID: 726A056D91.AFF5D X-intertainservices-MailScanner: Found to be clean X-intertainservices-MailScanner-From: mike.jakubik@intertainservices.com X-Spam-Status: No Cc: FreeBSD Ports , Waitman Gobble , "apache@FreeBSD.org" Subject: Re: apache22 options NG rewrite testers wanted X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 20:35:09 -0000 On Sun, 2012-09-02 at 10:15 +0200, Olli Hauer wrote: > On 2012-09-02 01:48, Waitman Gobble wrote: > >>> > > OK, I can do that... BUT those three options were 'already' selected when i did > >> > the test... > >> > > >> > snip ... > >> > > >> > > >> > So it seems more and more the reported issue is a local one. > > > > I agree. So you *don't* need testing on my 9 machine, right? > > Right, > > Thanks for your support! > > -- > Regards, > olli Hello, This change seems to break an upgrade path on my system. # pkg_version -v|grep needs apache-worker-2.2.22_5 < needs updating (port has 2.2.22_7) Ok, lets update it. # portmaster apache-worker ===>>> Currently installed version: apache-worker-2.2.22_5 ===>>> Port directory: /usr/ports/www/apache22 ===>>> This port is marked IGNORE ===>>> does not build with CGI. Please de-select CGI and select CGID instead ===>>> If you are sure you can build it, remove the IGNORE line in the Makefile and try again. Terminated Great, no more cgi, seems like cgid is the new cgi, OK, lets update the config. # cd /usr/ports/www/apache22 # make config Uncheck mod_cgi. Run portmaster again, same error message. # cd /usr/ports/www/apache22-worker-mpm # make config Hrm, mod_cgi is not even listed here. Lets trey to build this port. # make ===> apache22-worker-mpm-2.2.22_7 conflicts with installed package(s): apache-worker-2.2.22_5 They install files into the same place. You may want to stop build with Ctrl + C. Conflicts? It's the same port.... Thanks. From owner-freebsd-apache@FreeBSD.ORG Tue Sep 4 20:49:25 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA5211065670 for ; Tue, 4 Sep 2012 20:49:25 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id 312BA8FC1A for ; Tue, 4 Sep 2012 20:49:24 +0000 (UTC) Received: (qmail invoked by alias); 04 Sep 2012 20:49:18 -0000 Received: from p578be941.dip0.t-ipconnect.de (EHLO [192.168.0.100]) [87.139.233.65] by mail.gmx.net (mp019) with SMTP; 04 Sep 2012 22:49:18 +0200 X-Authenticated: #1956535 X-Provags-ID: V01U2FsdGVkX183yU0mBeQ3iQKEyphq0Khn5NW5sFNS7hbnf91KUO LeamMkHN/0LtPe Message-ID: <5046694D.4010808@gmx.de> Date: Tue, 04 Sep 2012 22:49:17 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: Mike Jakubik References: <1346543324.15749@da3m0n8t3r.com> <50431591.5040406@FreeBSD.org> <1346790578.1456.44.camel@mjakubik.localdomain> In-Reply-To: <1346790578.1456.44.camel@mjakubik.localdomain> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Cc: FreeBSD Ports , Olli Hauer , "apache@FreeBSD.org" , Waitman Gobble Subject: Re: apache22 options NG rewrite testers wanted X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 20:49:25 -0000 On 2012-09-04 22:29, Mike Jakubik wrote: > On Sun, 2012-09-02 at 10:15 +0200, Olli Hauer wrote: >> On 2012-09-02 01:48, Waitman Gobble wrote: >>>>>>> OK, I can do that... BUT those three options were 'already' selected when i did >>>>> the test... >>>>> >>>>> snip ... >>>>> >>>>> >>>>> So it seems more and more the reported issue is a local one. >>> >>> I agree. So you *don't* need testing on my 9 machine, right? >> >> Right, >> >> Thanks for your support! >> >> -- >> Regards, >> olli > > > > Hello, > > This change seems to break an upgrade path on my system. > > # pkg_version -v|grep needs > apache-worker-2.2.22_5 < needs updating (port has > 2.2.22_7) > > Ok, lets update it. > > # portmaster apache-worker > > ===>>> Currently installed version: apache-worker-2.2.22_5 > ===>>> Port directory: /usr/ports/www/apache22 > > ===>>> This port is marked IGNORE > ===>>> does not build with CGI. Please de-select CGI and select CGID > instead > > > ===>>> If you are sure you can build it, remove the > IGNORE line in the Makefile and try again. > Terminated > > Great, no more cgi, seems like cgid is the new cgi, OK, lets update the > config. > > # cd /usr/ports/www/apache22 > # make config > > Uncheck mod_cgi. Run portmaster again, same error message. > > # cd /usr/ports/www/apache22-worker-mpm > # make config > > Hrm, mod_cgi is not even listed here. Lets trey to build this port. > > # make > > ===> apache22-worker-mpm-2.2.22_7 conflicts with installed package(s): > apache-worker-2.2.22_5 > > They install files into the same place. > You may want to stop build with Ctrl + C. > > Conflicts? It's the same port.... > > Thanks. > Within the old framework we silently disabled CGI and enabled CGID. This is no longer possible with options NG since this adjustment has to be done before the option file is read by the framework. To disable CGI place a comment # in front of the following lines in apache-(event|worker)-mpm #OPTIONS_EXCLUDE= CGI #OPTIONS_UNSET+= CGI Then call make config deselect and the build will go on. As second solution you can change / delete the line in /var/db/ports/apache22-worker-mpm OPTIONS_FILE_SET+=CGI -> OPTIONS_FILE_UNSET+=CGI If possible wait the next 40min. Im reworking at the moment the last APR only option about IPv4-mapping. IPv6 is an APR only option and v4-mapping should be off by default. (My tests build are running at the moment, I only have to overcome the description limit with DIALOG ...) -- Regards, olli From owner-freebsd-apache@FreeBSD.ORG Tue Sep 4 22:39:05 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C15D01065673 for ; Tue, 4 Sep 2012 22:39:05 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.22]) by mx1.freebsd.org (Postfix) with SMTP id 298898FC08 for ; Tue, 4 Sep 2012 22:39:04 +0000 (UTC) Received: (qmail invoked by alias); 04 Sep 2012 22:39:03 -0000 Received: from p578be941.dip0.t-ipconnect.de (EHLO [192.168.0.100]) [87.139.233.65] by mail.gmx.net (mp034) with SMTP; 05 Sep 2012 00:39:03 +0200 X-Authenticated: #1956535 X-Provags-ID: V01U2FsdGVkX1+CI8AF0u+Cq2GFw6lyoXG0bYsyD/NyOhhAB3Pf3W r6wZ4rrsYz0Ic9 Message-ID: <50468308.9080206@gmx.de> Date: Wed, 05 Sep 2012 00:39:04 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: Mike Jakubik References: <1346543324.15749@da3m0n8t3r.com> <50431591.5040406@FreeBSD.org> <1346790578.1456.44.camel@mjakubik.localdomain> <5046694D.4010808@gmx.de> In-Reply-To: <5046694D.4010808@gmx.de> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Cc: FreeBSD Ports , Olli Hauer , "apache@FreeBSD.org" , Waitman Gobble Subject: Re: apache22 options NG rewrite testers wanted X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 22:39:05 -0000 On 2012-09-04 22:49, olli hauer wrote: > On 2012-09-04 22:29, Mike Jakubik wrote: >> On Sun, 2012-09-02 at 10:15 +0200, Olli Hauer wrote: >>> On 2012-09-02 01:48, Waitman Gobble wrote: >>>>>>>> OK, I can do that... BUT those three options were 'already' selected when i did >>>>>> the test... >>>>>> >>>>>> snip ... >>>>>> >>>>>> >>>>>> So it seems more and more the reported issue is a local one. >>>> >>>> I agree. So you *don't* need testing on my 9 machine, right? >>> >>> Right, >>> >>> Thanks for your support! >>> >>> -- >>> Regards, >>> olli >> >> >> >> Hello, >> >> This change seems to break an upgrade path on my system. >> >> # pkg_version -v|grep needs >> apache-worker-2.2.22_5 < needs updating (port has >> 2.2.22_7) >> >> Ok, lets update it. >> >> # portmaster apache-worker >> >> ===>>> Currently installed version: apache-worker-2.2.22_5 >> ===>>> Port directory: /usr/ports/www/apache22 >> >> ===>>> This port is marked IGNORE >> ===>>> does not build with CGI. Please de-select CGI and select CGID >> instead >> >> >> ===>>> If you are sure you can build it, remove the >> IGNORE line in the Makefile and try again. >> Terminated >> >> Great, no more cgi, seems like cgid is the new cgi, OK, lets update the >> config. >> >> # cd /usr/ports/www/apache22 >> # make config >> >> Uncheck mod_cgi. Run portmaster again, same error message. >> >> # cd /usr/ports/www/apache22-worker-mpm >> # make config >> >> Hrm, mod_cgi is not even listed here. Lets trey to build this port. >> >> # make >> >> ===> apache22-worker-mpm-2.2.22_7 conflicts with installed package(s): >> apache-worker-2.2.22_5 >> >> They install files into the same place. >> You may want to stop build with Ctrl + C. >> >> Conflicts? It's the same port.... >> Ah sorry, I answered only one part and only half ... CGI shouldn't be used with event and worker MPM. See http://httpd.apache.org/docs/2.2/mod/mod_cgi.html Since we know the chosen MPM only after the user selected the options and have then not really the possibility to disable CGI. We have to use IGNORE (before we silently changed CGI to CGID) For apache, apache-peruser-mpm and apache-itk-mpm CGI is still available and a valid option. The second change is with the look forward to pkg and apache24 so the PORTNAME, PACKAGENAME and LATEST_LINK do match (was not the case before) If you have issues with the way Bryan described just temporarily change in the www/apache port CONFLICTS= to _CONFLICTS. Btw. if you use portmaster -o www/apache22-worker-mpm www/apache22 you will end up with apache and not apache-worker-mpm Regards, olli From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 04:46:53 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE478106566B; Wed, 5 Sep 2012 04:46:53 +0000 (UTC) (envelope-from john.marshall@riverwillow.com.au) Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36]) by mx1.freebsd.org (Postfix) with ESMTP id 2A9138FC15; Wed, 5 Sep 2012 04:46:52 +0000 (UTC) Received: from rwpc15.mby.riverwillow.net.au (rwpc15.mby.riverwillow.net.au [172.25.24.201]) (authenticated bits=56) by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q854keDF020588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Sep 2012 14:46:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=riverwillow.com.au; s=m1001; t=1346820401; bh=nfT7gOv2qx/9TF6Zn3sRVTDqXUKlT75eA8onSzVGRjw=; h=Date:From:To:Subject; b=WhlMwO8RWN0rxK+b9mLRybsetlfWh9k3auvKjQG24s4Aq3Yg22h1XAwvYgyZoOl4b SEGVwvTpEuwoUgWiP5JYBmDJW87BYssdSkAuVhEZxJI7FO3m0x0aR1NuIbdv6f5yEG AzJokki89a5c2e67xJIpdT8JKoIbVgyZsKwpeBO4= Date: Wed, 5 Sep 2012 14:46:40 +1000 From: John Marshall To: apache@freebsd.org, freebsd-ports@freebsd.org Message-ID: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="opJtzjQTFsWo+cga" Content-Disposition: inline OpenPGP: id=A29A84A2; url=http://pki.riverwillow.com.au/pgp/johnmarshall.asc User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Subject: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 04:46:53 -0000 --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The new options provided with 2.2.22_8 blow away existing IPv4/IPv6 knobs and the port tries to build with IPv6 on a system which is IPv4 only. The ending is not happy. config.c: In function 'init_server_config': config.c:1984: error: 'APR_INET6' undeclared (first use in this function) config.c:1984: error: (Each undeclared identifier is reported only once config.c:1984: error: for each function it appears in.) /usr/local/share/apr/build-1/libtool --silent --mode=3Dcompile cc -g -O2 -I= /usr/local/include -O -pipe -march=3Dcore2 -I/usr/include -I. -I/buil= d/ports/www/apache22/work/httpd-2.2.22/os/unix -I/build/ports/www/apache22/= work/httpd-2.2.22/server/mpm/prefork -I/build/ports/www/apache22/work/httpd= -2.2.22/modules/http -I/build/ports/www/apache22/work/httpd-2.2.22/modules/= filters -I/build/ports/www/apache22/work/httpd-2.2.22/modules/proxy -I/buil= d/ports/www/apache22/work/httpd-2.2.22/include -I/build/ports/www/apache22/= work/httpd-2.2.22/modules/generators -I/build/ports/www/apache22/work/httpd= -2.2.22/modules/mappers -I/build/ports/www/apache22/work/httpd-2.2.22/modul= es/database -I/usr/local/include/apr-1 -I/usr/local/include -I/build/ports/= www/apache22/work/httpd-2.2.22/modules/proxy/../generators -I/usr/include -= I/build/ports/www/apache22/work/httpd-2.2.22/modules/ssl -I/build/ports/www= /apache22/work/httpd-2.2.22/modules/dav/main -prefer-non-pic -static -c lis= ten.c && touch listen.lo *** [config.lo] Error code 1 1 error *** [all-recursive] Error code 1 1 error *** [all-recursive] Error code 1 1 error *** [do-build] Error code 1 Stop in /build/ports/www/apache22. *** [build] Error code 1 Stop in /build/ports/www/apache22. I tried being creative and inserting --disable=3Dipv6 in a couple of different places but to no avail. Reverting to 2.2.22_7, where I could select IPv4 only, got me out of trouble. --=20 John Marshall --opJtzjQTFsWo+cga Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBG2TAACgkQw/tAaKKahKJkNwCgnK3WpZkkcRWBSoWB+7UfXK5W HukAn1bWiKxC+HPF3IKPX5nFUQxcs8sB =FYUw -----END PGP SIGNATURE----- --opJtzjQTFsWo+cga-- From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 05:27:11 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D124C106566C; Wed, 5 Sep 2012 05:27:11 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65]) by mx1.freebsd.org (Postfix) with ESMTP id 8A0E48FC08; Wed, 5 Sep 2012 05:27:11 +0000 (UTC) Received: from [192.168.0.100] (cde1100.uni.vrs [192.168.0.100]) (Authenticated sender: ohauer) by p578be941.dip0.t-ipconnect.de (Postfix) with ESMTPSA id 47060208AB; Wed, 5 Sep 2012 07:27:06 +0200 (CEST) Message-ID: <5046E2A7.2000204@FreeBSD.org> Date: Wed, 05 Sep 2012 07:27:03 +0200 From: Olli Hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: John Marshall References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> In-Reply-To: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 05:27:11 -0000 On 2012-09-05 06:46, John Marshall wrote: > The new options provided with 2.2.22_8 blow away existing IPv4/IPv6 > knobs and the port tries to build with IPv6 on a system which is IPv4 > only. The ending is not happy. > > config.c: In function 'init_server_config': > config.c:1984: error: 'APR_INET6' undeclared (first use in this function) > config.c:1984: error: (Each undeclared identifier is reported only once > config.c:1984: error: for each function it appears in.) > /usr/local/share/apr/build-1/libtool --silent --mode=compile cc -g -O2 -I/usr/local/include -O -pipe -march=core2 -I/usr/include -I. -I/build/ports/www/apache22/work/httpd-2.2.22/os/unix -I/build/ports/www/apache22/work/httpd-2.2.22/server/mpm/prefork -I/build/ports/www/apache22/work/httpd-2.2.22/modules/http -I/build/ports/www/apache22/work/httpd-2.2.22/modules/filters -I/build/ports/www/apache22/work/httpd-2.2.22/modules/proxy -I/build/ports/www/apache22/work/httpd-2.2.22/include -I/build/ports/www/apache22/work/httpd-2.2.22/modules/generators -I/build/ports/www/apache22/work/httpd-2.2.22/modules/mappers -I/build/ports/www/apache22/work/httpd-2.2.22/modules/database -I/usr/local/include/apr-1 -I/usr/local/include -I/build/ports/www/apache22/work/httpd-2.2.22/modules/proxy/../generators -I/usr/include -I/build/ports/www/apache22/work/httpd-2.2.22/modules/ssl -I/build/ports/www/apache22/work/httpd-2.2.22/modules/dav/main -prefer-non-pic -static -c listen.c && touch li sten.lo > *** [config.lo] Error code 1 > 1 error > *** [all-recursive] Error code 1 > 1 error > *** [all-recursive] Error code 1 > 1 error > *** [do-build] Error code 1 > > Stop in /build/ports/www/apache22. > *** [build] Error code 1 > > Stop in /build/ports/www/apache22. > > I tried being creative and inserting --disable=ipv6 in a couple of > different places but to no avail. Reverting to 2.2.22_7, where I could > select IPv4 only, got me out of trouble. > Please enable IPV4_MAPPED. The IPv6 parameter had no effect for apache since it was a APR (devele/apr) parameter. Unluckily there is no way for the Makefiles to check if APR was build without IPv6 support and do the change automatically. --Regards, olli From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 05:41:30 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B4363106566C; Wed, 5 Sep 2012 05:41:30 +0000 (UTC) (envelope-from john.marshall@riverwillow.com.au) Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36]) by mx1.freebsd.org (Postfix) with ESMTP id 1CF7A8FC18; Wed, 5 Sep 2012 05:41:29 +0000 (UTC) Received: from rwpc15.mby.riverwillow.net.au (rwpc15.mby.riverwillow.net.au [172.25.24.201]) (authenticated bits=56) by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q855fNw1023045 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Sep 2012 15:41:24 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=riverwillow.com.au; s=m1001; t=1346823684; bh=HJ70qmC39kLXTNa/zkv4DH9YtP4+ZWzYLnRlRGJQpKA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=YJ65V/d75h8W6VXtg6tKL5kcIJcqkZNFvGZQfNK6MiRgbaRdY2tnx3cS/7KMKRhFq TmQU8g2r4DK9M20onmFdDWmXsyOp0bGXha/yYHgxNxmo4KGaInjZTV9xPc+BSelWDt ggIUdayx2ySP1Zmr8vfq6aOjQvXPs769FoKnb1iM= Date: Wed, 5 Sep 2012 15:41:23 +1000 From: John Marshall To: Olli Hauer Message-ID: <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eJnRUKwClWJh1Khz" Content-Disposition: inline In-Reply-To: <5046E2A7.2000204@FreeBSD.org> OpenPGP: id=A29A84A2; url=http://pki.riverwillow.com.au/pgp/johnmarshall.asc User-Agent: Mutt/1.5.21 (2010-09-15) Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 05:41:30 -0000 --eJnRUKwClWJh1Khz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, 05 Sep 2012, 07:27 +0200, Olli Hauer wrote: > On 2012-09-05 06:46, John Marshall wrote: > > The new options provided with 2.2.22_8 blow away existing IPv4/IPv6 > > knobs and the port tries to build with IPv6 on a system which is IPv4 > > only. The ending is not happy. > >=20 > > config.c: In function 'init_server_config': > > config.c:1984: error: 'APR_INET6' undeclared (first use in this functio= n) > > config.c:1984: error: (Each undeclared identifier is reported only once > > config.c:1984: error: for each function it appears in.) >=20 > Please enable IPV4_MAPPED. >=20 > The IPv6 parameter had no effect for apache since it was a APR (devele/ap= r) parameter. >=20 > Unluckily there is no way for the Makefiles to check if APR was build wit= hout IPv6 support > and do the change automatically. Thanks Olli, I hadn't considered that option because its description says, "Allow IPv6 socket to handle IPv4", and the system doesn't have IPv6. However, because you suggested it, I tried anyway. Still no joy. config.c: In function 'init_server_config': config.c:1984: error: 'APR_INET6' undeclared (first use in this function) config.c:1984: error: (Each undeclared identifier is reported only once config.c:1984: error: for each function it appears in.) *** [config.lo] Error code 1 1 error *** [all-recursive] Error code 1 1 error *** [all-recursive] Error code 1 1 error *** [do-build] Error code 1 Stop in /build/ports/www/apache22. *** [build] Error code 1 Stop in /build/ports/www/apache22. rwsrv08# make showconfig | grep v6 IPV4_MAPPED=3Don: Allow IPv6 socket to handle IPv4 --=20 John Marshall --eJnRUKwClWJh1Khz Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBG5gMACgkQw/tAaKKahKJYtACgx2f0AHt6DIGGGzNSqRrcSVac V18An2wm7cJ3drqZO3luh5PbBvF7vIGO =cdkG -----END PGP SIGNATURE----- --eJnRUKwClWJh1Khz-- From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 05:52:25 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DB0C1065674; Wed, 5 Sep 2012 05:52:25 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65]) by mx1.freebsd.org (Postfix) with ESMTP id 43F8F8FC14; Wed, 5 Sep 2012 05:52:25 +0000 (UTC) Received: from [192.168.0.100] (cde1100.uni.vrs [192.168.0.100]) (Authenticated sender: ohauer) by p578be941.dip0.t-ipconnect.de (Postfix) with ESMTPSA id 1D9DA208AB; Wed, 5 Sep 2012 07:52:21 +0200 (CEST) Message-ID: <5046E897.90201@FreeBSD.org> Date: Wed, 05 Sep 2012 07:52:23 +0200 From: Olli Hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: John Marshall References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> In-Reply-To: <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ohauer@FreeBSD.org List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 05:52:25 -0000 On 2012-09-05 07:41, John Marshall wrote: > On Wed, 05 Sep 2012, 07:27 +0200, Olli Hauer wrote: >> On 2012-09-05 06:46, John Marshall wrote: >>> The new options provided with 2.2.22_8 blow away existing IPv4/IPv6 >>> knobs and the port tries to build with IPv6 on a system which is IPv4 >>> only. The ending is not happy. >>> >>> config.c: In function 'init_server_config': >>> config.c:1984: error: 'APR_INET6' undeclared (first use in this function) >>> config.c:1984: error: (Each undeclared identifier is reported only once >>> config.c:1984: error: for each function it appears in.) > >> >> Please enable IPV4_MAPPED. >> >> The IPv6 parameter had no effect for apache since it was a APR (devele/apr) parameter. >> >> Unluckily there is no way for the Makefiles to check if APR was build without IPv6 support >> and do the change automatically. > > Thanks Olli, > > I hadn't considered that option because its description says, "Allow > IPv6 socket to handle IPv4", and the system doesn't have IPv6. However, > because you suggested it, I tried anyway. Still no joy. > > config.c: In function 'init_server_config': > config.c:1984: error: 'APR_INET6' undeclared (first use in this function) > config.c:1984: error: (Each undeclared identifier is reported only once > config.c:1984: error: for each function it appears in.) > *** [config.lo] Error code 1 > 1 error > *** [all-recursive] Error code 1 > 1 error > *** [all-recursive] Error code 1 > 1 error > *** [do-build] Error code 1 > > Stop in /build/ports/www/apache22. > *** [build] Error code 1 > > Stop in /build/ports/www/apache22. > > rwsrv08# make showconfig | grep v6 > IPV4_MAPPED=on: Allow IPv6 socket to handle IPv4 > Do you have IPv6 in the devel/apr1 port enabled? The apache buildfiles are checking if APR_HAVE_IPV6 is present in the apr.h file (only the case if APR was build with IPV6) make showconfig -C /usr/ports/devel/apr1 | grep IPV6 IPV6=on: IPv6 protocol support Disable it there. From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 06:03:43 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0396A1065673; Wed, 5 Sep 2012 06:03:43 +0000 (UTC) (envelope-from john.marshall@riverwillow.com.au) Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36]) by mx1.freebsd.org (Postfix) with ESMTP id 7C4938FC14; Wed, 5 Sep 2012 06:03:42 +0000 (UTC) Received: from rwpc15.mby.riverwillow.net.au (rwpc15.mby.riverwillow.net.au [172.25.24.201]) (authenticated bits=56) by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q8563ccu024408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Sep 2012 16:03:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=riverwillow.com.au; s=m1001; t=1346825019; bh=USX0Stp87EeTryq15I6YUR45SeCsuxFVvWwZHoGnC6Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=dxiCP5KffQrNaXqTuuZmR6zwbLXmQWNChL5kbxEgbpqVjexZ/Vwqq6s+sSudfTZIF C4EGgKIYScBJyXThJZRZvy52DfAR5lD3tOGGZBQpG0L5YdsiN8Cwo96RAshD5NApIi fkiUk4qK0RLiCAqCcs+8CoFeARwcEo5sNNZYkkPM= Date: Wed, 5 Sep 2012 16:03:38 +1000 From: John Marshall To: Olli Hauer Message-ID: <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> <5046E897.90201@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="2JFBq9zoW8cOFH7v" Content-Disposition: inline In-Reply-To: <5046E897.90201@FreeBSD.org> OpenPGP: id=A29A84A2; url=http://pki.riverwillow.com.au/pgp/johnmarshall.asc User-Agent: Mutt/1.5.21 (2010-09-15) Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 06:03:43 -0000 --2JFBq9zoW8cOFH7v Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, 05 Sep 2012, 07:52 +0200, Olli Hauer wrote: >=20 > Do you have IPv6 in the devel/apr1 port enabled? No. rwsrv08# make showconfig -C /usr/ports/devel/apr1 | grep IPV6 IPV6=3Doff: IPv6 protocol support > The apache buildfiles are checking if APR_HAVE_IPV6 is present in the apr= =2Eh file (only the case if APR was build with IPV6) rwsrv08# grep V6 /usr/local/include/apr-1/apr.h #define APR_HAVE_IPV6 0 Maybe I'm looking in the wrong place or maybe the detection is broken? --=20 John Marshall --2JFBq9zoW8cOFH7v Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBG6zoACgkQw/tAaKKahKLcYACeKw8rz0XSRDmL2eIpTwzfFOIF hVwAoKkCYLZa5n5LD/AejzxylMvCC6G1 =u1rw -----END PGP SIGNATURE----- --2JFBq9zoW8cOFH7v-- From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 06:10:36 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8CC54106566B; Wed, 5 Sep 2012 06:10:36 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65]) by mx1.freebsd.org (Postfix) with ESMTP id 40CD78FC12; Wed, 5 Sep 2012 06:10:36 +0000 (UTC) Received: from [192.168.0.100] (cde1100.uni.vrs [192.168.0.100]) (Authenticated sender: ohauer) by p578be941.dip0.t-ipconnect.de (Postfix) with ESMTPSA id 38C1E208AB; Wed, 5 Sep 2012 08:10:33 +0200 (CEST) Message-ID: <5046ECDA.2000902@FreeBSD.org> Date: Wed, 05 Sep 2012 08:10:34 +0200 From: Olli Hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: John Marshall References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> <5046E897.90201@FreeBSD.org> <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> In-Reply-To: <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ohauer@FreeBSD.org List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 06:10:36 -0000 On 2012-09-05 08:03, John Marshall wrote: > On Wed, 05 Sep 2012, 07:52 +0200, Olli Hauer wrote: >> >> Do you have IPv6 in the devel/apr1 port enabled? > > No. > > rwsrv08# make showconfig -C /usr/ports/devel/apr1 | grep IPV6 > IPV6=off: IPv6 protocol support > >> The apache buildfiles are checking if APR_HAVE_IPV6 is present in the apr.h file (only the case if APR was build with IPV6) > > rwsrv08# grep V6 /usr/local/include/apr-1/apr.h > #define APR_HAVE_IPV6 0 > > Maybe I'm looking in the wrong place or maybe the detection is broken? > Can you test the following diff. Index: Makefile.modules =================================================================== --- Makefile.modules (revision 303680) +++ Makefile.modules (working copy) @@ -151,6 +151,7 @@ .else CONFIGURE_ARGS+= --disable-v4-mapped .endif +CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= --with-mpm=${WITH_MPM} From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 06:28:02 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8CEF2106566C; Wed, 5 Sep 2012 06:28:02 +0000 (UTC) (envelope-from john.marshall@riverwillow.com.au) Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36]) by mx1.freebsd.org (Postfix) with ESMTP id E7FF48FC17; Wed, 5 Sep 2012 06:28:01 +0000 (UTC) Received: from rwpc15.mby.riverwillow.net.au (rwpc15.mby.riverwillow.net.au [172.25.24.201]) (authenticated bits=56) by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q856RvMV025443 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Sep 2012 16:27:59 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=riverwillow.com.au; s=m1001; t=1346826479; bh=2N7Wtl77EMp8KBBGHYCpcTwMLlerVOENQNsMdwNxpDY=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=GE13EptOBvRWy1znVipUL8kFTUIPZKMEhkYEOYQORVhKyu4t3PEWLSoX2SLBbha3b 4j3DGXXbI/HYEXa7QQtyJ6+TUlqznebK4SQli0+aPpEdYcD9nabslsLqhW15wtJazu jXKC/Awv+YJI4/zHXWpngzNAhzIM+736i1F1yUCg= Date: Wed, 5 Sep 2012 16:27:57 +1000 From: John Marshall To: Olli Hauer Message-ID: <20120905062757.GF43255@rwpc15.mby.riverwillow.net.au> References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> <5046E897.90201@FreeBSD.org> <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> <5046ECDA.2000902@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1sNVjLsmu1MXqwQ/" Content-Disposition: inline In-Reply-To: <5046ECDA.2000902@FreeBSD.org> OpenPGP: id=A29A84A2; url=http://pki.riverwillow.com.au/pgp/johnmarshall.asc User-Agent: Mutt/1.5.21 (2010-09-15) Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 06:28:02 -0000 --1sNVjLsmu1MXqwQ/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, 05 Sep 2012, 08:10 +0200, Olli Hauer wrote: >=20 > Can you test the following diff. >=20 > Index: Makefile.modules > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- Makefile.modules (revision 303680) > +++ Makefile.modules (working copy) > @@ -151,6 +151,7 @@ > .else > CONFIGURE_ARGS+=3D --disable-v4-mapped > .endif > +CONFIGURE_ARGS+=3D --disable-ipv6 >=20 > CONFIGURE_ARGS+=3D --with-mpm=3D${WITH_MPM} >=20 No change. Same symptoms. That's actually one of the patches I tried prior to my original post. The previous version of Makefile.modules (r303550) doesn't include the server_config.c patch if IPv6 is disabled. I think that's the (conditional) behaviour we need restored. If I remove the file files/patch-server__config.c, the port builds fine. --=20 John Marshall --1sNVjLsmu1MXqwQ/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBG8O0ACgkQw/tAaKKahKI33ACcCIDLTOT7z1RZ1jptKfKxfmhR etsAoIt8/AwdWPEH/b4LoQh6ORFt4LWV =13N9 -----END PGP SIGNATURE----- --1sNVjLsmu1MXqwQ/-- From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 06:34:15 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8628C1065674 for ; Wed, 5 Sep 2012 06:34:15 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id C4D848FC1B for ; Wed, 5 Sep 2012 06:34:14 +0000 (UTC) Received: (qmail invoked by alias); 05 Sep 2012 06:34:12 -0000 Received: from ip-2-205-144-94.web.vodafone.de (EHLO [2.205.144.94]) [2.205.144.94] by mail.gmx.net (mp029) with SMTP; 05 Sep 2012 08:34:12 +0200 X-Authenticated: #1956535 X-Provags-ID: V01U2FsdGVkX18CNngWk/gC3qW0AOhzunzM4vOmwhICW3/getGNh8 MGcOfcVCfeuUPf Message-ID: <5046F25F.1060602@gmx.de> Date: Wed, 05 Sep 2012 08:34:07 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: John Marshall References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> <5046E897.90201@FreeBSD.org> <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> <5046ECDA.2000902@FreeBSD.org> <20120905062757.GF43255@rwpc15.mby.riverwillow.net.au> In-Reply-To: <20120905062757.GF43255@rwpc15.mby.riverwillow.net.au> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 06:34:15 -0000 On 2012-09-05 08:27, John Marshall wrote: > On Wed, 05 Sep 2012, 08:10 +0200, Olli Hauer wrote: >> >> Can you test the following diff. >> >> Index: Makefile.modules >> =================================================================== >> --- Makefile.modules (revision 303680) >> +++ Makefile.modules (working copy) >> @@ -151,6 +151,7 @@ >> .else >> CONFIGURE_ARGS+= --disable-v4-mapped >> .endif >> +CONFIGURE_ARGS+= --disable-ipv6 >> >> CONFIGURE_ARGS+= --with-mpm=${WITH_MPM} >> > > No change. Same symptoms. That's actually one of the patches I tried > prior to my original post. > > The previous version of Makefile.modules (r303550) doesn't include the > server_config.c patch if IPv6 is disabled. I think that's the > (conditional) behaviour we need restored. If I remove the file > files/patch-server__config.c, the port builds fine. Thanks for the report, I will rework the patch so it checks for APR_HAVE_IPV6. From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 06:38:11 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EC35106564A; Wed, 5 Sep 2012 06:38:11 +0000 (UTC) (envelope-from john.marshall@riverwillow.com.au) Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36]) by mx1.freebsd.org (Postfix) with ESMTP id 0F8FE8FC0A; Wed, 5 Sep 2012 06:38:10 +0000 (UTC) Received: from rwpc15.mby.riverwillow.net.au (rwpc15.mby.riverwillow.net.au [172.25.24.201]) (authenticated bits=56) by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q856bvLw025925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Sep 2012 16:37:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=riverwillow.com.au; s=m1001; t=1346827079; bh=paPFneuTgd3KySnTrXvIsQQ365khXk/hhQMmAf3o/qc=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=VeHEh1TWaSwCIXxsEtgg65nUdInLkE7QcHzpnsYCFGI3F7IOhaHq2wFRJgylEFymd 1qMco99RlxoNcfM7mHb0AqmWB1oiGn1nWgj3cgTKFrWCXPSnuENTG3ASk4P9XniupF sC73aVaaj1FeHiDpGSS0PzZDZVNZ5YLLp/vu1bbY= Date: Wed, 5 Sep 2012 16:37:57 +1000 From: John Marshall To: olli hauer Message-ID: <20120905063757.GG43255@rwpc15.mby.riverwillow.net.au> References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> <5046E897.90201@FreeBSD.org> <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> <5046ECDA.2000902@FreeBSD.org> <20120905062757.GF43255@rwpc15.mby.riverwillow.net.au> <5046F25F.1060602@gmx.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="EXKGNeO8l0xGFBjy" Content-Disposition: inline In-Reply-To: <5046F25F.1060602@gmx.de> OpenPGP: id=A29A84A2; url=http://pki.riverwillow.com.au/pgp/johnmarshall.asc User-Agent: Mutt/1.5.21 (2010-09-15) Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 06:38:11 -0000 --EXKGNeO8l0xGFBjy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, 05 Sep 2012, 08:34 +0200, olli hauer wrote: > On 2012-09-05 08:27, John Marshall wrote: > > The previous version of Makefile.modules (r303550) doesn't include the > > server_config.c patch if IPv6 is disabled. I think that's the > > (conditional) behaviour we need restored. If I remove the file > > files/patch-server__config.c, the port builds fine. >=20 > Thanks for the report, I will rework the patch so it checks for > APR_HAVE_IPV6. Thank you Olli, and thank you for maintaining this port. --=20 John Marshall --EXKGNeO8l0xGFBjy Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBG80UACgkQw/tAaKKahKKOLQCfb6Z9gPb6oSc+/6k0oArOtuAJ tzwAn30be2FIP7geEpblzQAA5YOnws9W =3MMn -----END PGP SIGNATURE----- --EXKGNeO8l0xGFBjy-- From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 06:46:01 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90BAE1065670 for ; Wed, 5 Sep 2012 06:46:01 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id CFAC08FC15 for ; Wed, 5 Sep 2012 06:46:00 +0000 (UTC) Received: (qmail invoked by alias); 05 Sep 2012 06:45:59 -0000 Received: from ip-2-205-144-94.web.vodafone.de (EHLO [2.205.144.94]) [2.205.144.94] by mail.gmx.net (mp031) with SMTP; 05 Sep 2012 08:45:59 +0200 X-Authenticated: #1956535 X-Provags-ID: V01U2FsdGVkX19DeSQBciBDuYwxQIa5H/J0L/OArAUIAe++RTT9z+ QxX9zL5prMTuAn Message-ID: <5046F525.6060100@gmx.de> Date: Wed, 05 Sep 2012 08:45:57 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: John Marshall References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> <5046E897.90201@FreeBSD.org> <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> <5046ECDA.2000902@FreeBSD.org> <20120905062757.GF43255@rwpc15.mby.riverwillow.net.au> <5046F25F.1060602@gmx.de> <20120905063757.GG43255@rwpc15.mby.riverwillow.net.au> In-Reply-To: <20120905063757.GG43255@rwpc15.mby.riverwillow.net.au> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 06:46:01 -0000 On 2012-09-05 08:37, John Marshall wrote: > On Wed, 05 Sep 2012, 08:34 +0200, olli hauer wrote: >> On 2012-09-05 08:27, John Marshall wrote: >>> The previous version of Makefile.modules (r303550) doesn't include the >>> server_config.c patch if IPv6 is disabled. I think that's the >>> (conditional) behaviour we need restored. If I remove the file >>> files/patch-server__config.c, the port builds fine. >> >> Thanks for the report, I will rework the patch so it checks for >> APR_HAVE_IPV6. > Please can you test the following patch ad replacement for the existing one and remove the --disable-ipv6 line again. http://people.freebsd.org/~ohauer/diffs/apache/patch-server__config.c From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 07:05:46 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2465E1065677; Wed, 5 Sep 2012 07:05:46 +0000 (UTC) (envelope-from john.marshall@riverwillow.com.au) Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36]) by mx1.freebsd.org (Postfix) with ESMTP id 986C28FC1B; Wed, 5 Sep 2012 07:05:45 +0000 (UTC) Received: from rwpc15.mby.riverwillow.net.au (rwpc15.mby.riverwillow.net.au [172.25.24.201]) (authenticated bits=56) by mail1.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id q8575Yr8027519 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Sep 2012 17:05:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=riverwillow.com.au; s=m1001; t=1346828736; bh=5AGoUcPwpMTfOn2z/dOivg1WO5NKWB2PXXSnTSUWDXc=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=US+sGPbeCIH6xQMI/0VxrX54Mmr/NM8nMyg8mbOFYfR+VSPa5+TGLCaauE1wDZrD3 Ja6R48nQkO20LudF/vjxmCG57W0Yw9iRuNiFjLs4Fvh8utSnzE4M3GqAB/Qxe109E0 e7nk7+2LCKwkoCSKdxXCF5kQ3aUOCYlVNVn90HJ0= Date: Wed, 5 Sep 2012 17:05:34 +1000 From: John Marshall To: olli hauer Message-ID: <20120905070534.GH43255@rwpc15.mby.riverwillow.net.au> References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> <5046E897.90201@FreeBSD.org> <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> <5046ECDA.2000902@FreeBSD.org> <20120905062757.GF43255@rwpc15.mby.riverwillow.net.au> <5046F25F.1060602@gmx.de> <20120905063757.GG43255@rwpc15.mby.riverwillow.net.au> <5046F525.6060100@gmx.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oPmsXEqKQNHCSXW7" Content-Disposition: inline In-Reply-To: <5046F525.6060100@gmx.de> OpenPGP: id=A29A84A2; url=http://pki.riverwillow.com.au/pgp/johnmarshall.asc User-Agent: Mutt/1.5.21 (2010-09-15) Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 07:05:46 -0000 --oPmsXEqKQNHCSXW7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, 05 Sep 2012, 08:45 +0200, olli hauer wrote: > Please can you test the following patch ad replacement for the existing > one and remove the --disable-ipv6 line again. > http://people.freebsd.org/~ohauer/diffs/apache/patch-server__config.c Thank you. Builds and runs on: - FreeBSD 9.1-RC1 amd64 - FreeBSD 8.3-RELEASE i386 --=20 John Marshall --oPmsXEqKQNHCSXW7 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBG+b4ACgkQw/tAaKKahKIZnwCgy67YeWb+uxr3h5Mcnqsse0eS A9sAn2oX89kSJJWOwbBiPy7KaVXq1IjC =GxzB -----END PGP SIGNATURE----- --oPmsXEqKQNHCSXW7-- From owner-freebsd-apache@FreeBSD.ORG Wed Sep 5 07:28:50 2012 Return-Path: Delivered-To: apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A7941065673 for ; Wed, 5 Sep 2012 07:28:50 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id 774CC8FC15 for ; Wed, 5 Sep 2012 07:28:48 +0000 (UTC) Received: (qmail invoked by alias); 05 Sep 2012 07:28:48 -0000 Received: from hu5.abaxx.de (EHLO [10.6.25.100]) [213.61.170.110] by mail.gmx.net (mp031) with SMTP; 05 Sep 2012 09:28:48 +0200 X-Authenticated: #1956535 X-Provags-ID: V01U2FsdGVkX18Nd7txz9QNJ/86e3mKYypew0lesNDYNXLfgCAsFJ KyWuFBvBhyriqT Message-ID: <5046FF2F.8060207@gmx.de> Date: Wed, 05 Sep 2012 09:28:47 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: John Marshall References: <20120905044640.GC43255@rwpc15.mby.riverwillow.net.au> <5046E2A7.2000204@FreeBSD.org> <20120905054123.GD43255@rwpc15.mby.riverwillow.net.au> <5046E897.90201@FreeBSD.org> <20120905060338.GE43255@rwpc15.mby.riverwillow.net.au> <5046ECDA.2000902@FreeBSD.org> <20120905062757.GF43255@rwpc15.mby.riverwillow.net.au> <5046F25F.1060602@gmx.de> <20120905063757.GG43255@rwpc15.mby.riverwillow.net.au> <5046F525.6060100@gmx.de> <20120905070534.GH43255@rwpc15.mby.riverwillow.net.au> In-Reply-To: <20120905070534.GH43255@rwpc15.mby.riverwillow.net.au> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Cc: apache@freebsd.org, freebsd-ports@freebsd.org Subject: Re: www/apache22 2.2.22_8 broken on IPv4-only system X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 07:28:50 -0000 On 2012-09-05 09:05, John Marshall wrote: > On Wed, 05 Sep 2012, 08:45 +0200, olli hauer wrote: >> Please can you test the following patch ad replacement for the existing >> one and remove the --disable-ipv6 line again. >> http://people.freebsd.org/~ohauer/diffs/apache/patch-server__config.c > > Thank you. Builds and runs on: > > - FreeBSD 9.1-RC1 amd64 > - FreeBSD 8.3-RELEASE i386 > Thank you! I will send the new patch as update to the upstream apache development. -- Regards, olli From owner-freebsd-apache@FreeBSD.ORG Fri Sep 7 23:46:30 2012 Return-Path: Delivered-To: freebsd-apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8B9CE106566B for ; Fri, 7 Sep 2012 23:46:30 +0000 (UTC) (envelope-from corsmith@gmail.com) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4D2758FC12 for ; Fri, 7 Sep 2012 23:46:29 +0000 (UTC) Received: by obbun3 with SMTP id un3so295951obb.13 for ; Fri, 07 Sep 2012 16:46:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=bgItkW/NvRl+tl97ne0Ajpd/5sWieU73OEdiknzhGLo=; b=JMjMCEK5MNOXMm2ll6nFejyzK8ZPaHeHhsg5I453zLaDFKM9BuG+VfqlD/QRDwGgnV LO+EZuhiJiRkdCotrC8uytk09e4sh49sBapNmoJC+pO2tRbfWTpZJCGr2Op22WBS2lej d1J8gToobrW117GylJCUrCtB4ZbQu5lX6YjF3bSUlt/MFPart5/IlmyL+bHISLydxyEH GMsCZymU1bjKFtwkz3XatQ42B2r0yzfOH8p6WxSfsu8PUwbx9QtrkCrGNtHdyW/20I5S 8m+UP89peH1jntWcky9qwxp53VCGghZ5mOLUQ4loWqq+yioCgBwa8KdVqqRbCbK2zx11 uUNg== MIME-Version: 1.0 Received: by 10.60.25.193 with SMTP id e1mr7591307oeg.87.1347061589171; Fri, 07 Sep 2012 16:46:29 -0700 (PDT) Received: by 10.182.45.201 with HTTP; Fri, 7 Sep 2012 16:46:29 -0700 (PDT) Date: Fri, 7 Sep 2012 19:46:29 -0400 Message-ID: From: Corey Smith To: freebsd-apache@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: Current status of www/apache24 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2012 23:46:30 -0000 Has anybody made any effort to port Apache 2.4.x yet? I didn't see anything in google, the mailing list archives or the problem reports. If not I will probably give an initial port a try this weekend. -Corey Smith From owner-freebsd-apache@FreeBSD.ORG Sat Sep 8 12:20:58 2012 Return-Path: Delivered-To: freebsd-apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 038F11065672 for ; Sat, 8 Sep 2012 12:20:58 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id 491F28FC08 for ; Sat, 8 Sep 2012 12:20:57 +0000 (UTC) Received: (qmail invoked by alias); 08 Sep 2012 12:20:56 -0000 Received: from p578be941.dip0.t-ipconnect.de (EHLO [192.168.0.100]) [87.139.233.65] by mail.gmx.net (mp041) with SMTP; 08 Sep 2012 14:20:56 +0200 X-Authenticated: #1956535 X-Provags-ID: V01U2FsdGVkX1/4OD8hJzz4FJe3e3wUHvFxFOzeMUuhQDzZMUXO5p SwdPwnyHRvNch3 Message-ID: <504B382B.80403@gmx.de> Date: Sat, 08 Sep 2012 14:20:59 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: freebsd-apache@freebsd.org References: In-Reply-To: X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Cc: Subject: Re: Current status of www/apache24 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Sep 2012 12:20:58 -0000 On 2012-09-08 01:46, Corey Smith wrote: > Has anybody made any effort to port Apache 2.4.x yet? I didn't see > anything in google, the mailing list archives or the problem reports. > > If not I will probably give an initial port a try this weekend. > > -Corey Smith Hi Corey, I'm working on it. First milestone was the more or less rewrite of bsd.apache.mk, apache22 port and the apr update. There are some really important parts to honor, for example Apache 2.4 and onwards doesn't require linking the MPM module directly in the httpd binary anymore. APXS lost the MPM_NAME query, so we can't assume a given MPM anymore. But at the moment we need the MPM information in some places to adjust build parameters (for example in bsd.php.mk). Next every port which use the macro "USE_APACHE=22+" should be tested to build against apache24 (~130 ports). So you see, there are some more places to look. -- Regards, olli From owner-freebsd-apache@FreeBSD.ORG Sat Sep 8 15:47:50 2012 Return-Path: Delivered-To: freebsd-apache@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9687106566B for ; Sat, 8 Sep 2012 15:47:50 +0000 (UTC) (envelope-from corsmith@gmail.com) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 974F88FC0A for ; Sat, 8 Sep 2012 15:47:50 +0000 (UTC) Received: by obbun3 with SMTP id un3so1151633obb.13 for ; Sat, 08 Sep 2012 08:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=B8uSWGICshobDnT5QWTZWyH6rpD1bW4b8AOv/+Wo2YE=; b=W4XWzBV1SVR91uef45m47yjyuvDjun5AfTxzm2oIzgjGyyzlIxcBKINikFyc3/OjHV DvIFFJOc/AswbWXJ6bfJKeEWGdxGust8YhJ1rrwujSkhE4esFhwB6hoMdYi1hEfZrOQG iU57y1h5v9g0tWLLgegfHitn+EmtMuJnuXIRJUsv5dkTRWh4M4lP5cijwQQkQhenBzuk W8rN8cAL1PP/9pkBKxGLWpbiiUUvT+F7P7Dged009K4u0sfAiS1Mkfss2N0yPQtwmtct P2wj2R9nevPJhH3YJmA4JavJ2zURe+DciUX9YA+kIZSn7/dqkoZ2lXbiqrAxJW8uUWqd Lckw== MIME-Version: 1.0 Received: by 10.182.172.74 with SMTP id ba10mr9026385obc.83.1347119269826; Sat, 08 Sep 2012 08:47:49 -0700 (PDT) Received: by 10.182.45.201 with HTTP; Sat, 8 Sep 2012 08:47:49 -0700 (PDT) In-Reply-To: <504B382B.80403@gmx.de> References: <504B382B.80403@gmx.de> Date: Sat, 8 Sep 2012 11:47:49 -0400 Message-ID: From: Corey Smith To: olli hauer Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-apache@freebsd.org Subject: Re: Current status of www/apache24 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Sep 2012 15:47:51 -0000 On Sat, Sep 8, 2012 at 8:20 AM, olli hauer wrote: > I'm working on it. > Do you have the patches or a repo available anywhere? I would be glad to help with testing. -Corey Smith