Package: libxslt
Version: 1.1.35-1
Severity: normal
Tags: patch  pending

Dear maintainer,

I've prepared an NMU for libxslt (versioned as 1.1.35-1.1) and
uploaded it to sid.


Regards
Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru libxslt-1.1.35/debian/changelog libxslt-1.1.35/debian/changelog
--- libxslt-1.1.35/debian/changelog	2022-07-15 15:29:07.000000000 +0200
+++ libxslt-1.1.35/debian/changelog	2024-07-09 13:56:17.000000000 +0200
@@ -1,3 +1,11 @@
+libxslt (1.1.35-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add missing #include <stdlib.h> to fix FTFBS. Closes: #1073312
+  * Use pkg-config to locate libgcrypt. Closes: #1071937
+
+ -- Andreas Metzler <[email protected]>  Tue, 09 Jul 2024 13:56:17 +0200
+
 libxslt (1.1.35-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru libxslt-1.1.35/debian/patches/0010_missing_include.diff libxslt-1.1.35/debian/patches/0010_missing_include.diff
--- libxslt-1.1.35/debian/patches/0010_missing_include.diff	1970-01-01 01:00:00.000000000 +0100
+++ libxslt-1.1.35/debian/patches/0010_missing_include.diff	2024-07-09 13:32:41.000000000 +0200
@@ -0,0 +1,34 @@
+Description: Add missing #include <stdlib.h> to fix FTFBS.
+Author: Andreas Metzler <[email protected]>
+Bug-Debian: https://bugs.debian.org/1073312
+Applied-Upstream: 1.39, https://gitlab.gnome.org/GNOME/libxslt/-/commit/b7f824f613a0da3e6cefc5dc558ff597eb6545b4
+Last-Update: 2024-07-09
+
+--- a/libxslt/extensions.c
++++ b/libxslt/extensions.c
+@@ -10,10 +10,11 @@
+  */
+ 
+ #define IN_LIBXSLT
+ #include "libxslt.h"
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <limits.h>
+ 
+ #include <libxml/xmlmemory.h>
+ #include <libxml/tree.h>
+--- a/libexslt/date.c
++++ b/libexslt/date.c
+@@ -36,10 +36,11 @@
+ #include <libxslt/xsltInternals.h>
+ #include <libxslt/extensions.h>
+ 
+ #include "exslt.h"
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <limits.h>
+ 
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
diff -Nru libxslt-1.1.35/debian/patches/0011_libgcrypt_pkgconfig.diff libxslt-1.1.35/debian/patches/0011_libgcrypt_pkgconfig.diff
--- libxslt-1.1.35/debian/patches/0011_libgcrypt_pkgconfig.diff	1970-01-01 01:00:00.000000000 +0100
+++ libxslt-1.1.35/debian/patches/0011_libgcrypt_pkgconfig.diff	2024-07-09 13:56:17.000000000 +0200
@@ -0,0 +1,42 @@
+Description: Use pkg-config to locate libgcrypt.
+Author: Andreas Metzler <[email protected]>
+Bug-Debian: https://bugs.debian.org/1071937
+Last-Update: 2024-07-09
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -368,31 +368,16 @@ case $host in
+     dnl crypto libraries
+     WITH_CRYPTO=1
+     CRYPTO_TESTDIR=crypto
+     ;;
+   *)
+-    AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+-    if test "$LIBGCRYPT_CONFIG" != "no" ; then
+-      LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
+-      if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
+-      then
+-        LIBGCRYPT_CFLAGS=""
+-        LIBGCRYPT_LIBS=""
+-        echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.'
+-      else
+-        LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
+-        LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs`
++    PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= 1.1.41],
+         AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.])
+         echo 'Crypto extensions will be available.'
+         WITH_CRYPTO=1
+-        CRYPTO_TESTDIR=crypto
+-      fi
+-    else
+-      LIBGCRYPT_CFLAGS=""
+-      LIBGCRYPT_LIBS=""
+-      echo 'Crypto extensions will not be available. Install libgcrypt and reconfigure to make available.'
+-    fi
++        CRYPTO_TESTDIR=crypto,
++      echo 'Crypto extensions will not be available. Install libgcrypt >=1.1.41 and reconfigure to make available.')
+ esac
+ fi
+ AC_SUBST(WITH_CRYPTO)
+ AC_SUBST(CRYPTO_TESTDIR)
+ AC_SUBST(LIBGCRYPT_CFLAGS)
diff -Nru libxslt-1.1.35/debian/patches/series libxslt-1.1.35/debian/patches/series
--- libxslt-1.1.35/debian/patches/series	2022-04-09 14:38:57.000000000 +0200
+++ libxslt-1.1.35/debian/patches/series	2024-07-09 13:56:17.000000000 +0200
@@ -3,3 +3,5 @@
 0003-remove-plugin-in-xslt-config.patch
 0004-do-not-clean-manpage.patch
 0005-Drop-libdir-and-static-linking-information-from-xslt.patch
+0010_missing_include.diff
+0011_libgcrypt_pkgconfig.diff

Attachment: signature.asc
Description: PGP signature

Reply via email to