Oleksandr Kryvulia
b61744b734
Changelogs: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-20.20.0.html https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-20.20.1.html PR: 296366 Security: GHSA-3g56-cgrh-95p5 Security: GHSA-3rhj-hhw7-m6fw Security: GHSA-4pgv-j3mr-3rcp Security: GHSA-589g-qgf8-m6mx Security: GHSA-746q-794h-cc7f Security: GHSA-8jhw-m2hg-vp3h Security: GHSA-8jw3-ccr9-xrmf Security: GHSA-g8q2-p36q-94f6 Security: GHSA-j2mm-57pq-jh94 Security: GHSA-mxgm-8c6f-5p8f Security: GHSA-ph27-3m5q-mj5m Security: GHSA-q9fr-m7g8-6ph5 Security: GHSA-qf8j-jp7h-c5hx Security: GHSA-r6c2-hwc2-j4mp Security: GHSA-vfhr-r9x9-c687 Security: GHSA-vrfp-mg3q-3959 Security: GHSA-wcvv-g26m-wx5c Security: GHSA-x348-j6c9-77f3 Security: GHSA-xgj6-2gc5-5x9c Sponsored by: FLEX-IT LLC Sponsored by: UNIS Labs MFH: 2026Q2
46 lines
2.6 KiB
Plaintext
46 lines
2.6 KiB
Plaintext
--- build_tools/make_xml_documentation.orig 2026-06-29 05:19:08 UTC
|
|
+++ build_tools/make_xml_documentation
|
|
@@ -226,7 +226,7 @@ for subdir in ${mod_subdirs} ; do
|
|
mn=${bn%%.*}
|
|
fi
|
|
# Set the module name on specific elements
|
|
- ${SED} -r -e "s/<(manager|managerEvent|managerEventInstance|function|application|info)\s+([^>]+)>/<\1 \2 module=\"${mn}\">/g" "${tmp_output_file}" >> "${output_file}"
|
|
+ ${SED} -r -e "s/<(manager|managerEvent|managerEventInstance|function|application|info)[[:space:]]+([^>]+)>/<\1 \2 module=\"${mn}\">/g" "${tmp_output_file}" >> "${output_file}"
|
|
done
|
|
for i in $(${FIND} "${subdir_path}" -name '*.xml') ; do
|
|
${GREP} -q "appdocsxml.dtd" "${i}" || continue
|
|
@@ -238,13 +238,13 @@ for subdir in ${mod_subdirs} ; do
|
|
${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; }
|
|
fi
|
|
fi
|
|
- ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" > "${tmp_output_file}"
|
|
+ ${SED} -r "/^[[:space:]]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" > "${tmp_output_file}"
|
|
dirname=${i%/*}
|
|
if [ "${dirname}" != "${subdir_path}" ] ; then
|
|
# If we're in a subdirectory like channels/pjsip, we need to check channels/Makefile
|
|
# to see which module xml files in this directory belong to.
|
|
bn=${dirname##*/}
|
|
- mn=$(${SED} -n -r -e "s/^[$]\(call MOD_ADD_C,([^,]+),[$]\(wildcard\s+${bn}\/.*/\1/gp" "${subdir_path}/Makefile")
|
|
+ mn=$(${SED} -n -r -e "s/^[$]\(call MOD_ADD_C,([^,]+),[$]\(wildcard[[:space:]]+${bn}\/.*/\1/gp" "${subdir_path}/Makefile")
|
|
else
|
|
if [ "${subdir}" = "main" ] ; then
|
|
# Force the module to be "builtin" if the XML is in the main directory.
|
|
@@ -257,7 +257,7 @@ for subdir in ${mod_subdirs} ; do
|
|
fi
|
|
fi
|
|
# Set the module name on specific elements
|
|
- ${SED} -r -e "s/<(manager|managerEvent|managerEventInstance|function|application|info)\s+([^>]+)>/<\1 \2 module=\"${mn}\">/g" "${tmp_output_file}" >> "${output_file}"
|
|
+ ${SED} -r -e "s/<(manager|managerEvent|managerEventInstance|function|application|info)[[:space:]]+([^>]+)>/<\1 \2 module=\"${mn}\">/g" "${tmp_output_file}" >> "${output_file}"
|
|
done
|
|
done
|
|
|
|
@@ -266,7 +266,7 @@ cp "${output_file}" "${tmp_output_file}"
|
|
# Some entries may already have a module attribute so remove the dup.
|
|
# It's easier to do this once on the entire file rather on a source-by-source basis.
|
|
cp "${output_file}" "${tmp_output_file}"
|
|
-${SED} -r -e 's/module="([^"]+)"\s+module="([^"]+)">/module="\1">/g' "${tmp_output_file}" > "${output_file}"
|
|
+${SED} -r -e 's/module="([^"]+)"[[:space:]]+module="([^"]+)">/module="\1">/g' "${tmp_output_file}" > "${output_file}"
|
|
|
|
|
|
if [ "${for_wiki}" -eq "1" ] ; then
|