[xml/sgml-pkgs] Bug#497585: --output option makes xsltproc ignore --xinclude

[Joachim Breitner]

Package: xsltproc
Version: 1.1.24-2
Severity: important
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I was about to pull out my hair trying to debug some strangenss with
xinclude in my XML files when I finally discoverd this bug:

xsltproc does honour --xinclude only when it outputs its result to
stdout, _not_ when sending it somewhere using --output.

The attached patch fixes this. Please consider applying it for the next
upload.

The code paths of xsltproc with and without --output seem to differ
quite a lot, there might be more problems hidden.

Greetings,
Joachim

BTW: The --xincludestyle parameter is not documented in the manpage.


- -- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.25-2-486
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xsltproc depends on:
ii  libc6                      2.7-13        GNU C Library: Shared libraries
ii  libgcrypt11                1.4.1-1       LGPL Crypto library - runtime libr
ii  libxml2                    2.6.32.dfsg-3 GNOME XML library
ii  libxslt1.1                 1.1.24-2      XSLT processing library - runtime 

xsltproc recommends no packages.

xsltproc suggests no packages.

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAki9rS4ACgkQ9ijrk0dDIGzq3gCeIfmX/PJ69939lXjmEDM7uBQs
5DYAoIma3UpuuJWG1dNNrqQ16aWihxZ8
=kq23
-----END PGP SIGNATURE-----
-------------- next part --------------
reverted:
--- libxslt-1.1.24/debian/changelog
+++ libxslt-1.1.24/debian/changelog
@@ -1,3 +1,9 @@
+libxslt (1.1.24-2.nomeata1) UNRELEASED; urgency=low
+
+  * Use --inlude even when writing to a file
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 02 Sep 2008 22:58:01 +0200
+
 libxslt (1.1.24-2) unstable; urgency=high
 
   * libexslt/crypto.c: Apply upstream fix for CVE-2008-2935. Closes: #493162.
reverted:
--- libxslt-1.1.24.orig/xsltproc/xsltproc.c
+++ libxslt-1.1.24/xsltproc/xsltproc.c
@@ -461,6 +461,10 @@
 	ctxt = xsltNewTransformContext(cur, doc);
 	if (ctxt == NULL)
 	    return;
+#ifdef LIBXML_XINCLUDE_ENABLED
+	if (xinclude)
+	    ctxt->xinclude = 1;
+#endif
 	if (profile) {
 	    ret = xsltRunStylesheetUser(cur, doc, params, output,
 		                        NULL, NULL, stderr, ctxt);