Page MenuHomeFreeBSD
Files F135089016

D750.id1430.diff
No OneTemporary
Actions

D750.id1430.diff
View Options

Index: Mk/bsd.apache.mk
===================================================================
--- Mk/bsd.apache.mk
+++ Mk/bsd.apache.mk
@@ -182,9 +182,9 @@
# avoid duplicate search paths
.if ${LOCALBASE} == ${PREFIX}
SUEXEC_SAFEPATH?= ${LOCALBASE}/bin:/usr/bin:/bin
-.else
+.else
SUEXEC_SAFEPATH?= ${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin
-.endif
+.endif
SUEXEC_LOGFILE?= /var/log/httpd-suexec.log
SUEXEC_UIDMIN?= 1000
SUEXEC_GIDMIN?= 1000
@@ -288,8 +288,6 @@
. endif
.elif defined(APACHE_PORT)
_APACHE_VERSION!= ${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
-.else
-_APACHE_VERSION:= ${DEFAULT_APACHE_VERSION}
.endif
.if defined(USE_APACHE)
@@ -305,30 +303,61 @@
_APACHE_VERSION_MINIMUM:= ${_APACHE_VERSION_MINIMUM_TMP:M[1-9][0-9]}
_APACHE_VERSION_MAXIMUM_TMP:= ${_APACHE_VERSION_CHECK:C/.*-([1-9][0-9])/\1/}
_APACHE_VERSION_MAXIMUM:= ${_APACHE_VERSION_MAXIMUM_TMP:M[1-9][0-9]}
+#.warning DEBUG __01 MIN % "${_APACHE_VERSION_MINIMUM}" , MAX % "${_APACHE_VERSION_MAXIMUM}"
+
+# ==============================================================
+# num+
+.if ${_USE_APACHE:M*+}
+_APACHE_WANTED_VERSIONS= ${DEFAULT_APACHE_VERSION}
+
+# -num
+.elif ${_USE_APACHE:M\-[0-9][0-9]}
+. for _v in ${APACHE_SUPPORTED_VERSION:O}
+. if ${_APACHE_VERSION_MAXIMUM} >= ${_v}
+_APACHE_WANTED_VERSIONS+= ${_v}
+. endif
+. endfor
+
+# num-num
+.elif ${_USE_APACHE:M[0-9][0-9]-[0-9][0-9]}
+. for _v in ${APACHE_SUPPORTED_VERSION}
+. if ${_APACHE_VERSION_MINIMUM} <= ${_v} && ${_APACHE_VERSION_MAXIMUM} >= ${_v}
+_APACHE_WANTED_VERSIONS+= ${_v}
+. endif
+. endfor
-.if defined(_APACHE_VERSION)
-# Validate Apache version whether it meets USE_APACHE version restriction.
-. if !empty(_APACHE_VERSION_MINIMUM) && (${_APACHE_VERSION} < ${_APACHE_VERSION_MINIMUM})
-_APACHE_VERSION_NONSUPPORTED= ${_APACHE_VERSION_MINIMUM} at least
-. elif !empty(_APACHE_VERSION_MAXIMUM) && (${_APACHE_VERSION} > ${_APACHE_VERSION_MAXIMUM})
-_APACHE_VERSION_NONSUPPORTED= ${_APACHE_VERSION_MAXIMUM} at most
+# num
+.elif ${_USE_APACHE:M[0-9][0-9]}
+_APACHE_WANTED_VERSIONS= ${_USE_APACHE:M[0-9][0-9]}
+.endif
+# ==============================================================
+
+.if !defined(_APACHE_WANTED_VERSIONS)
+_APACHE_WANTED_VERSIONS= ${DEFAULT_APACHE_VERSION}
+.endif
+
+.for _v in ${_APACHE_WANTED_VERSIONS:O:u}
+_APACHE_HIGHEST_VERSION:= ${_v}
+. if defined (_APACHE_VERSION) && ${_APACHE_VERSION} == ${_v}
+_APACHE_WANTED_VERSION:= ${_v}
+. endif
+.endfor
+
+.if !defined(_APACHE_WANTED_VERSION)
+# next line broken on 8.x and 9.x but OK on 10
+#_APACHE_WANTED_VERSION:= ${_APACHE_WANTED_VERSIONS:O:u:M${DEFAULT_APACHE_VERSION}}
+# working line on 8.x, 9.x, 10
+_APACHE_WANTED_VERSION:= ${_APACHE_WANTED_VERSIONS:O:u:MDEFAULT_APACHE_VERSION}
+. if empty(_APACHE_WANTED_VERSION)
+_APACHE_WANTED_VERSION:= ${_APACHE_HIGHEST_VERSION}
. endif
+.endif
-. if defined(_APACHE_VERSION_NONSUPPORTED) && !defined(AP_IGNORE_VERSION_CHECK)
+.if defined(_APACHE_VERSION) && ${_APACHE_VERSION} != ${_APACHE_WANTED_VERSION}
BROKEN= ${_ERROR_MSG} apache${_APACHE_VERSION} is installed (or APACHE_PORT is defined) and port requires apache${_APACHE_VERSION_NONSUPPORTED}
-. endif
-.else # defined(_APACHE_VERSION)
-. for ver in ${APACHE_SUPPORTED_VERSION}
-__VER= ${ver}
-. if !defined(_APACHE_VERSION) && \
- !(!empty(_APACHE_VERSION_MINIMUM) && ( ${__VER} < ${_APACHE_VERSION_MINIMUM} )) && \
- !(!empty(_APACHE_VERSION_MAXIMUM) && ( ${__VER} > ${_APACHE_VERSION_MAXIMUM} ))
-_APACHE_VERSION= ${ver}
-. endif
-. endfor
-.endif # defined(_APACHE_VERSION)
+.endif
-APACHE_VERSION:= ${_APACHE_VERSION}
+APACHE_VERSION:= ${_APACHE_WANTED_VERSION}
.if exists(${APXS})
APXS_PREFIX!= ${APXS} -q prefix 2> /dev/null || echo NULL
@@ -487,7 +516,7 @@
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
@${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
-. if !defined(DEBUG)
+. if !defined(DEBUG)
@${ECHO_MSG} "===> strip ${APACHEMODDIR}/${MODULENAME}.so"
@[ -e ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so ] && ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
. else

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 7, 9:34 AM (2 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24990827
Default Alt Text
D750.id1430.diff (4 KB)

Event Timeline