Merge ~athos-ribeiro/ubuntu/+source/isc-kea:fix-js into ubuntu/+source/isc-kea:ubuntu/devel

[Athos Ribeiro]

This change removes a downloaded js file from the kea-doc binary package.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/kea-no-js/+packages

Submitted to Debian in https://salsa.debian.org/debian/isc-kea/-/merge_requests/20

This is one of the change requests from the MIR team to promote isc-kea.

[Athos Ribeiro (athos-ribeiro)]

Ideally, we want to rebase and merge this after
https://code.launchpad.net/~ahasenack/ubuntu/+source/isc-kea/+git/isc-kea/+merge/437388

is merged, since that MP may be affected by the feature freeze, and this most likely will not.

0b729b7... by Andreas Hasenack on 2023-02-20

  * d/t/kea-dhcp4: make the test more robust (LP: #2007855):
    - increase dhclient timeout to 60s, and run in verbose mode
    - show logs in the case of failure
    - set +e inside the cleanup handler
    - fix resolv.conf regexp

4a384f9... by Andreas Hasenack on 2023-02-20

update-maintainer

ee0f85c... by Andreas Hasenack on 2023-02-20

changelog

e33e562... by Athos Ribeiro on 2023-02-22

    - d/rules: do not download external JS files in kea-doc.

979ab31... by Athos Ribeiro on 2023-02-22

    - d/control: add Recommends libjs-mathjax in kea-doc.

d5014f6... by Athos Ribeiro on 2023-02-22

Update changelog

[Athos Ribeiro (athos-ribeiro)]

I changed this MP to comply to the changes introduced in
https://salsa.debian.org/debian/isc-kea/-/merge_requests/20

Do note that while we are no longer fetching JS data from the internet in the binary kea-doc package, in default Ubuntu installations, with the snapped version of firefox, the 2 affected html pages will no longer correctly render the formulas that use mathjax. However, the formula is still rendered in a raw TeX format.

This happens because the snapped version of firefox cannot read files under /usr/share/doc. Still, given how simple the affected formulas are, this should not heavily affect readability. The proper solution for the issue lies in the firefox snap, as mentioned by Paride in https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/1955325.

For further references on this changes, see the discussions in https://salsa.debian.org/debian/isc-kea/-/merge_requests/20

[Andreas Hasenack (ahasenack)]

I'll review this as soon as I'm done with another review (landscape-client) that needs to happen before FF hopefully.

[Athos Ribeiro (athos-ribeiro)]

This is present in Debian and a new merge is most likely coming soon. If we do merge 2.2.0-4, this will no longer be needed (it is already included in debian).

[Andreas Hasenack (ahasenack)]

Jeremy Bicha synced[1] 2.2.0-4, which includes the change from this MP.

1. https://launchpad.net/ubuntu/+source/isc-kea/2.2.0-4

[Athos Ribeiro (athos-ribeiro)]

2.2.0-4 has migrated, which, as mentioned by Andreas, already includes this fix.

diff --git a/debian/changelog b/debian/changelog
index bb30f8e..8d4375c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-kea (2.2.0-3ubuntu2) lunar; urgency=medium
+
+  * d/rules: do not download external JS files in kea-doc.
+  * d/control: add Recommends libjs-mathjax in kea-doc.
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 22 Feb 2023 14:17:16 -0300
+
 isc-kea (2.2.0-3ubuntu1) lunar; urgency=medium
 
   * d/t/kea-dhcp4: make the test more robust (LP: #2007855):
diff --git a/debian/control b/debian/control
index 7506b58..6113f14 100644
--- a/debian/control
+++ b/debian/control
@@ -157,6 +157,8 @@ Architecture: all
 Section: doc
 Depends:
  ${misc:Depends},
+Recommends:
+ libjs-mathjax,
 Description: Documentation for Kea DHCP server
  Kea is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium.
  .
diff --git a/debian/rules b/debian/rules
index 45937db..7982c6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,13 @@ override_dh_auto_configure:
 		--without-werror \
 		--with-site-packages=/usr/lib/python3/dist-packages
 
+execute_after_dh_auto_build-indep:
+	# Do not download external JS components in binary documentation package
+	# Inspired by similar removal in python-pyopencl
+	# Thanks to Andreas Beckmann
+	find doc/sphinx/_build/html -name '*.html' -exec sed -r -i -e '\,( *)<script async="async" src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>,i \1<script src="/usr/share/javascript/mathjax/MathJax.js"></script>' {} +
+	find doc/sphinx/_build/html -name '*.html' -exec sed -r -i -e 's,https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js,/usr/share/javascript/mathjax/config/TeX-MML-AM_CHTML.js,' {} +
+
 execute_after_dh_install:
 	dh_apparmor -pkea-ctrl-agent --profile-name=usr.sbin.kea-ctrl-agent
 	dh_apparmor -pkea-dhcp4-server --profile-name=usr.sbin.kea-dhcp4