Changeset 103978 in vbox for trunk

Timestamp:

Mar 21, 2024 3:32:41 AM (10 months ago)

Author:

vboxsync

Message:

doc/manual,/Config.kmk: Workaround for newish libxml restriction.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• doc/manual/Config.kmk (modified) (1 diff)
• doc/manual/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -3633 +3633 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_JAVA_VERSION    := $(call VBOX_JAVA_FIGURE_VERSION, $(VBOX_JAVAC))'
  endif
+        $(QUIET)$(APPEND) '$@' '#$(which $(VBOX_XSLTPROC))'
+        $(QUIET)$(APPEND) '$@' 'VBOX_XSLTPROC_VERSION        := $$(firstword $(shell $(VBOX_XSLTPROC) --version | $(SED) -e /libxslt/q | $(SED) -e 's/^.*libxslt \([0-9][0-9]*\)[^0-9]*.*/\1/' ) 0)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_XSLTPROC_LIBXML_VERSION := $$(firstword $(shell $(VBOX_XSLTPROC) --version | $(SED) -e /libxml/q  | $(SED) -e 's/^.*libxml \([0-9][0-9]*\)[^0-9]*.*/\1/'  ) 0)'
 
         $(QUIET)$(ECHO) '========= START OF $@ ========='

trunk/doc/manual/Config.kmk

@@ -140 +140 @@
   VBOX_XMLLINT_WITH_CAT    = $(VBOX_XMLLINT) --nonet --xinclude --noout $(VBOX_XMLLINT_OPTS) --path "$(VBOX_PATH_MANUAL_OUTBASE)"
  endif
+ # Workaround for a security (?) fix in libxml (xsltproc doesn't have a way of setting the max amp level):
+ #     utilitiesDomain.mod:135: parser error : Maximum entity amplification factor exceeded, see xmlCtxtSetMaxAmplification.
+ if $(firstword $(VBOX_XSLTPROC_LIBXML_VERSION) 0) >= 21206 ## @todo not sure which version introduced this issue.
+  VBOX_XSLTPROC_WORKAROUND := --novalid
+ else
+  VBOX_XSLTPROC_WORKAROUND :=
+ endif
 
 

trunk/doc/manual/Makefile.kmk

@@ -672 +672 @@
                 --mapping-file "$$(VBOX_USER_MANUAL_ID_MAPPING_FILE_$1)" \
                 "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/topics/flat-$(2).dita"
-        $$(QUIET)$$(ASH) \
+        $$(QUIET)$$(ASH) -x \
                 "$$(VBOX_PATH_MANUAL_SRC)/dita-refentry-flat-to-single-topic.sh" \
                 "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/topics/flat-$(2).dita" \
@@ -678 +678 @@
                 "$$(VBOX_PATH_MANUAL_SRC)/dita-refentry-flat-to-single-topic.xsl" \
                 "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/topics" \
-                -- $$(subst $$(REDIRECT),$$(REDIRECT_EXT),$$(call VBOX_XSLTPROC_WITH_CAT)) \
+                -- $$(subst $$(REDIRECT),$$(REDIRECT_EXT),$$(call VBOX_XSLTPROC_WITH_CAT)) $(VBOX_XSLTPROC_WORKAROUND) \
                 --path "$$(VBOX_DITA_TECHNICAL_CONTENT_DTD_PATH)"
-        $$(QUIET)$$(call VBOX_XSLTPROC_WITH_CAT) \
+        $$(QUIET)$$(call VBOX_XSLTPROC_WITH_CAT) $(VBOX_XSLTPROC_WORKAROUND) \
                 --path "$$(VBOX_DITA_TECHNICAL_CONTENT_DTD_PATH)" \
                 --stringparam g_sMode map \
@@ -732 +732 @@
                 $(VBOX_PATH_MANUAL_SRC)/$(1)/dita/UserManual.ditamap
         $$(APPEND) -n "[email protected]" '</files>'
-        $$(QUIET)$$(call VBOX_XSLTPROC_WITH_CAT) --path "$$(VBOX_DITA_TECHNICAL_CONTENT_DTD_PATH)" \
+        $$(QUIET)$$(call VBOX_XSLTPROC_WITH_CAT) $(VBOX_XSLTPROC_WORKAROUND) --path "$$(VBOX_DITA_TECHNICAL_CONTENT_DTD_PATH)" \
                 --output "$$@" \
                 $$(VBOX_PATH_MANUAL_SRC)/$(1)/vboxmanage-cmd-overview.xsl \