Date: Wed, 18 Jul 2012 05:40:38 GMT From: Marcello Silva Coutinho <marcellocoutinho@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/169958: unify all apache22-xxx-mpm options to apache22 make config Message-ID: <201207180540.q6I5ecwq085599@red.freebsd.org> Resent-Message-ID: <201207180550.q6I5o6Xg062810@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169958 >Category: ports >Synopsis: unify all apache22-xxx-mpm options to apache22 make config >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 18 05:50:06 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Marcello Silva Coutinho >Release: 8.3 >Organization: >Environment: FreeBSD bsd816.trf1.gov.br 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Tue Jun 12 00:39:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: unifies all apache22-xxx-mpm options to apache22 make config. This was a todo on Makefile.modules It also helps pbi builds that checks for apache version. As this page has a 100k limit I could not send all apache22.shar file but I've published it on my server http://e-sac.siteseguro.ws/pfsense/ports/apache22.shar Attached are the files diff, missing the patch files for peruser-mpm available on it's ports files dir. >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.options.orig 2012-07-16 21:46:30.000000000 +0000 +++ Makefile.options 2012-07-16 23:04:40.000000000 +0000 @@ -1,4 +1,8 @@ OPTIONS+= \ + MPM_WORKER "Enable worker MPM module" OFF \ + MPM_ITK "Enable EXPERIMENTAL itk MPM module" OFF \ + MPM_EVENT "Enable EXPERIMENTAL event MPM module" OFF \ + MPM_PERUSER "Enable EXPERIMENTAL peruser MPM module" OFF \ AUTH_BASIC "Enable mod_auth_basic" ON \ AUTH_DIGEST "Enable mod_auth_digest" ON \ AUTHN_FILE "Enable mod_authn_file" ON \ --- Makefile.modules.orig 2012-07-16 21:45:52.000000000 +0000 +++ Makefile.modules 2012-07-16 23:05:38.000000000 +0000 @@ -44,38 +44,61 @@ .endif +. if (!defined(WITH_MPM_WORKER) && !defined(WITH_MPM_ITK) && !defined(WITH_MPM_EVENT) && !defined (WITH_MPM_PERUSER)) +PLIST_SUB+= PREFORK="" WORKER="@comment " EVENT="@comment " +.endif + .if defined(_PREMKINCLUDED) # MPM section: -# << TO BE WRITTEN >> -.if defined (SLAVE_PORT_MPM) -PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment " -PKGNAMESUFFIX= -${SLAVE_PORT_MPM} -.else -. if ${WITH_MPM} != "prefork" -PKGNAMESUFFIX= -${WITH_MPM:L} -. if ${WITH_MPM} != "itk" -WITH_THREADS= yes -WITH_THREADS_MODULES= yes -WITHOUT_MODULES+= cgi -. endif -. if ${WITH_MPM:L} == "worker" +.if defined(WITH_MPM_WORKER) +. if (defined(WITH_MPM_ITK) || defined(WITH_MPM_EVENT) || defined (WITH_MPM_PERUSER)) +IGNORE+= Select only one MPM module to compile. +. endif +. if (!defined(WITH_THREADS)) +IGNORE+= mpm_worker requires WITH_THREADS. +. endif PLIST_SUB+= PREFORK="@comment " WORKER="" EVENT="@comment " -. elif ${WITH_MPM:L} == "event" -PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="" -. elif ${WITH_MPM:L} == "itk" +WITH_MPM= worker +WITHOUT_MODULES+= cgi +.endif + +.if defined(WITH_MPM_ITK) +. if (defined(WITH_MPM_EVENT) || defined (WITH_MPM_PERUSER)) +IGNORE+= Select only one MPM module to compile. +. endif +. if defined(WITH_THREADS) +IGNORE+= mpm_itk conflicts with WITH_THREADS option. +. endif PLIST_SUB+= PREFORK="@comment " 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 -. else -IGNORE= "Unknown MPM: ${WITH_MPM}" -. endif -. else -PLIST_SUB+= PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment " EVENT="@comment " -. endif -.else +WITH_MPM= itk +EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-${MPM_ITK_VERSION} +EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-perdir-regex +.endif + +.if defined(WITH_MPM_EVENT) +. if defined (WITH_MPM_PERUSER) +IGNORE+= Select only one MPM module to compile. +. endif +. if (!defined(WITH_THREADS)) +IGNORE+= mpm_event requires WITH_THREADS. +. endif +PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="" +WITHOUT_MODULES+= cgi +WITH_MPM= event +.endif + +.if defined(WITH_MPM_PERUSER) +. if (!defined(WITH_THREADS)) +IGNORE+= mpm_event requires WITH_THREADS. +. endif +#PLIST_SUB+= PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment " EVENT="@comment " PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment " +WITHOUT_MODULES+= cgi +WITH_MPM= peruser +WITH_SLAVE_MPM= peruser +EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch +EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0-dc3.patch +EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0-dc3-r57.patch .endif # xDBM section >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207180540.q6I5ecwq085599>