[Pkg-gmagick-im-team] Bug#971216: doxygen build error

Sven Mueller sven.mueller72 at gmail.com
Sat Dec 19 22:29:36 GMT 2020


Control: tags -1 patch

Hi once more.

@Paolo: There is a question for you:
Could you imagine (no pun intended) to include the change in the
imagemagick version of the dh_doxygen script into the version in the
doxygen package, possibly behind an option? It replaces known (currently
only jquery) .js files by a symlink to the relevant known location of the
(here:) jquery file and creates a substvar with the required
dependency/dependencies.
This would eventually eliminate the need to keep a script in the
imagemagick sources in sync with the doxygen package.
The replacement is desirable from a security standpoint, as it reduces the
places that need patching if another jquery vulnerability surfaces.

I attached two things to this email: The full updated dh_doxygen script as
it would need to be in the imagemagick package (compatible with both older
and newer doxygen versions) and the patch to the one currently in the
imagemagick package.

Below are my findings from my investigation:

So: Looking at the imagemagick-6-doc package, replacing the full
debian/scripts/dh_doxygen call (including all parameters) with _just_
"/usr/bin/dh_doxygen" (without any parameters) causes the following
differences in the imagemagick-6-doc package:

(+ from the contents for the newly built package, - for the original
package currently in the Debian archive):

--rw-r--r-- root/root 2020-07-27 03:13
./usr/share/doc/imagemagick-6-common/html/www/api/MagickCore/doxygen.png
+-rw-r--r-- root/root 2020-07-27 03:13
./usr/share/doc/imagemagick-6-common/html/www/api/MagickCore/doxygen.svg
The above seems correct.

-lrwxrwxrwx root/root 2020-07-27 03:13
./usr/share/doc/imagemagick-6-common/html/www/api/MagickCore/jquery.js ->
../../../../../../javascript/jquery/jquery.js
+-rw-r--r-- root/root 2020-07-27 03:13
./usr/share/doc/imagemagick-6-common/html/www/api/MagickCore/jquery.js
-lrwxrwxrwx root/root 2020-07-27 03:13
./usr/share/doc/imagemagick-6-common/html/www/api/MagickWand/doxygen.png ->
../MagickCore/doxygen.png
+lrwxrwxrwx root/root 2020-07-27 03:13
./usr/share/doc/imagemagick-6-common/html/www/api/MagickWand/doxygen.svg ->
../MagickCore/doxygen.svg
-lrwxrwxrwx root/root 2020-07-27 03:13
./usr/share/doc/imagemagick-6-common/html/www/api/MagickWand/jquery.js ->
../../../../../../javascript/jquery/jquery.js
+lrwxrwxrwx root/root 2020-07-27 03:13
./usr/share/doc/imagemagick-6-common/html/www/api/MagickWand/jquery.js ->
../MagickCore/jquery.js

There is a problem though: The original dh_doxygen script in the
imagemagick source replaces .js files with appropriate symlinks and
generates some substvars. Maybe this is functionality that should get added
to the original dh_doxygen script? CC'ing Paolo for this, see intro.

Cheers,
Sven

Attached is a patch to the included dh_doxygen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-gmagick-im-team/attachments/20201219/e6b5d09a/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_doxygen_failure.patch
Type: text/x-patch
Size: 865 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-gmagick-im-team/attachments/20201219/e6b5d09a/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dh_doxygen
Type: application/octet-stream
Size: 5799 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-gmagick-im-team/attachments/20201219/e6b5d09a/attachment.obj>


More information about the Pkg-gmagick-im-team mailing list