Jim Klimov
2023-11-01 14bc9be4a1255088702a2bc501fd8665ccd22e05
docbook: fix docbook-catalog-install.sh (used in svc:/application/desktop-cache/docbook-catalog-update:default) for edge case of zero-sized lost catalog file: /etc/xml/catalog (add "delegate" rules)

2 files modified
23 ■■■■■ changed files
components/docbook/docbook/Makefile 2 ●●● patch | view | raw | blame | history
components/docbook/docbook/files/docbook-catalog-install.sh 21 ●●●●● patch | view | raw | blame | history
components/docbook/docbook/Makefile
@@ -17,7 +17,7 @@
COMPONENT_NAME= docbook
COMPONENT_VERSION= 2.30.0
COMPONENT_REVISION= 5
COMPONENT_REVISION= 6
COMPONENT_SUMMARY= docbook SGML and XML stylesheets
COMPONENT_FMRI= data/docbook
COMPONENT_CLASSIFICATION= Desktop (GNOME)/Documentation
components/docbook/docbook/files/docbook-catalog-install.sh
@@ -749,10 +749,31 @@
CATALOG=/etc/xml/catalog
# Normally the baseline file is delivered by the package and
# then grows according to updates with new docbook releases.
# This logic repeats what the package recipe does, to "revive"
# the file if it gets corrupted or deleted on a deployed system.
if [ ! -s $CATALOG ]
then
    # Empty or missing file confuses further "add" operations
    /usr/bin/xmlcatalog --create > $CATALOG
    # Now put the common DocBook entries in it
    /usr/bin/xmlcatalog --noout --add "delegatePublic" \
        "-//OASIS//ENTITIES DocBook XML" \
        "file:///usr/share/sgml/docbook/xmlcatalog" $CATALOG
    /usr/bin/xmlcatalog --noout --add "delegatePublic" \
        "-//OASIS//DTD DocBook XML" \
        "file:///usr/share/sgml/docbook/xmlcatalog" $CATALOG
    /usr/bin/xmlcatalog --noout --add "delegatePublic" \
        "ISO 8879:1986" \
        "file:///usr/share/sgml/docbook/xmlcatalog" $CATALOG
    /usr/bin/xmlcatalog --noout --add "delegateSystem" \
        "http://www.oasis-open.org/docbook/" \
        "file:///usr/share/sgml/docbook/xmlcatalog" $CATALOG
    /usr/bin/xmlcatalog --noout --add "delegateURI" \
        "http://www.oasis-open.org/docbook/" \
        "file:///usr/share/sgml/docbook/xmlcatalog" $CATALOG
fi
/usr/bin/xmlcatalog --noout --add "rewriteSystem" \