Package: libprelude Version: 1.0.0-11.3 Severity: normal Tags: patch pending
Dear maintainer,
I've prepared an NMU for libprelude (versioned as 1.0.0-11.4) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
kind regards
Andreas
* 010_gnutlsextrainclude.diff: Do not try to #include <gnutls/extra.h> if it
is not necessary, i.e. when gnutls is new enough (>= 1.2) to ship SRP in
the main library instead of gnutls-extra.
* Build and depend on libgnutls28-dev instead of libgnutls-dev.
Closes: #754771
* Add a (build-)dependency on libgcrypt20-dev.
Closes: #745951
* 016_ppc64el-isnan-tests-fix-for-little-endian-PowerPC.patch from gnulib
upstream to fix test-isnanl-nolibm failure on ppc64el. (Thanks,
Mauricio Faria de Oliveira) - This should fix #751822.
--
`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 libprelude-1.0.0/debian/changelog libprelude-1.0.0/debian/changelog --- libprelude-1.0.0/debian/changelog 2014-08-05 19:29:12.000000000 +0200 +++ libprelude-1.0.0/debian/changelog 2014-08-15 07:28:48.000000000 +0200 @@ -1,3 +1,19 @@ +libprelude (1.0.0-11.4) unstable; urgency=medium + + * Non-maintainer upload. + * 010_gnutlsextrainclude.diff: Do not try to #include <gnutls/extra.h> if it + is not necessary, i.e. when gnutls is new enough (>= 1.2) to ship SRP in + the main library instead of gnutls-extra. + * Build and depend on libgnutls28-dev instead of libgnutls-dev. + Closes: #754771 + * Add a (build-)dependency on libgcrypt20-dev. + Closes: #745951 + * 016_ppc64el-isnan-tests-fix-for-little-endian-PowerPC.patch from gnulib + upstream to fix test-isnanl-nolibm failure on ppc64el. (Thanks, + Mauricio Faria de Oliveira) - This should fix #751822. + + -- Andreas Metzler <[email protected]> Fri, 15 Aug 2014 07:28:43 +0200 + libprelude (1.0.0-11.3) unstable; urgency=low * Non-maintainer upload. diff -Nru libprelude-1.0.0/debian/control libprelude-1.0.0/debian/control --- libprelude-1.0.0/debian/control 2014-05-25 15:58:53.000000000 +0200 +++ libprelude-1.0.0/debian/control 2014-08-12 19:55:04.000000000 +0200 @@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, quilt, - libgnutls-dev(>> 1.2.9), + libgnutls28-dev, + libgcrypt20-dev, python-all-dev (>> 2.6.6), libperl-dev, libltdl-dev, @@ -20,7 +21,8 @@ Package: libprelude-dev Section: libdevel Architecture: any -Depends: libprelude2 (= ${binary:Version}), libgnutls-dev, libltdl3-dev, ${misc:Depends} +Depends: libprelude2 (= ${binary:Version}), libgnutls28-dev, libgcrypt20-dev, + libltdl3-dev, ${misc:Depends} Description: Security Information Management System [ Development files ] Prelude is a Universal "Security Information Management" (SIM) system. Its goals are performance and modularity. It is divided in two main diff -Nru libprelude-1.0.0/debian/patches/010_gnutlsextrainclude.diff libprelude-1.0.0/debian/patches/010_gnutlsextrainclude.diff --- libprelude-1.0.0/debian/patches/010_gnutlsextrainclude.diff 1970-01-01 01:00:00.000000000 +0100 +++ libprelude-1.0.0/debian/patches/010_gnutlsextrainclude.diff 2014-08-12 19:30:25.000000000 +0200 @@ -0,0 +1,40 @@ +diff -NurBbp libprelude-1.0.0-bak/configure.in libprelude-1.0.0/configure.in +--- libprelude-1.0.0-bak/configure.in 2010-03-10 13:20:02.000000000 +0100 ++++ libprelude-1.0.0/configure.in 2014-08-12 19:28:06.163918564 +0200 +@@ -207,6 +207,8 @@ if test x$srp_available = xno; then + AC_DEFINE_UNQUOTED(GNUTLS_SRP_ENABLED, , Define whether SRP support is enabled) + PRELUDE_ADMIN_CFLAGS="-DNEED_GNUTLS_EXTRA $LIBGNUTLS_EXTRA_CFLAGS" + PRELUDE_ADMIN_LIBS="$LIBGNUTLS_EXTRA_LIBS" ++ AC_DEFINE([NEED_GNUTLS_EXTRA_INCLUDE], [1], ++ [Define whether we need to include gnutls/extra.h for srp]) + fi + + LIBS=$old_LIBS +diff -NurBbp libprelude-1.0.0-bak/prelude-admin/prelude-admin.c libprelude-1.0.0/prelude-admin/prelude-admin.c +--- libprelude-1.0.0-bak/prelude-admin/prelude-admin.c 2010-01-29 12:01:15.000000000 +0100 ++++ libprelude-1.0.0/prelude-admin/prelude-admin.c 2014-08-12 19:26:37.419920859 +0200 +@@ -57,7 +57,9 @@ + #include <errno.h> + #include <gnutls/gnutls.h> + #include <gnutls/x509.h> +-#include <gnutls/extra.h> ++#if NEED_GNUTLS_EXTRA_INCLUDE ++# include <gnutls/extra.h> ++#endif + + #include "common.h" + #include "config-engine.h" +diff -NurBbp libprelude-1.0.0-bak/prelude-admin/server.c libprelude-1.0.0/prelude-admin/server.c +--- libprelude-1.0.0-bak/prelude-admin/server.c 2010-01-29 12:01:15.000000000 +0100 ++++ libprelude-1.0.0/prelude-admin/server.c 2014-08-12 19:26:37.419920859 +0200 +@@ -39,7 +39,9 @@ + + #include <gcrypt.h> + #include <gnutls/gnutls.h> +-#include <gnutls/extra.h> ++#if NEED_GNUTLS_EXTRA_INCLUDE ++# include <gnutls/extra.h> ++#endif + + #include "prelude-client.h" + #include "prelude-error.h" diff -Nru libprelude-1.0.0/debian/patches/016_ppc64el-isnan-tests-fix-for-little-endian-PowerPC.patch libprelude-1.0.0/debian/patches/016_ppc64el-isnan-tests-fix-for-little-endian-PowerPC.patch --- libprelude-1.0.0/debian/patches/016_ppc64el-isnan-tests-fix-for-little-endian-PowerPC.patch 1970-01-01 01:00:00.000000000 +0100 +++ libprelude-1.0.0/debian/patches/016_ppc64el-isnan-tests-fix-for-little-endian-PowerPC.patch 2014-08-13 19:07:36.000000000 +0200 @@ -0,0 +1,46 @@ +curl 'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=patch;h=e962c07c0c8bb18f9a5969cbf1ddb01d0fe4f55c' \ + | filterdiff \ + --strip=1 \ + --addoldprefix='a/libmissing/' \ + --addnewprefix='b/libmissing/' \ + -i '*/tests/test-isnanl.h' \ + -i '*/tests/test-signbit.c' \ + > 'ppc64el-isnan-tests-fix-for-little-endian-PowerPC.patch' + +--- a/libmissing/tests/test-isnanl.h ++++ b/libmissing/tests/test-isnanl.h +@@ -51,6 +51,15 @@ main () + /* A bit pattern that is different from a Quiet NaN. With a bit of luck, + it's a Signalling NaN. */ + { ++#if defined __powerpc__ && LDBL_MANT_DIG == 106 ++ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are ++ represented as the corresponding 64-bit IEEE values in the first double; ++ the second is ignored. Manipulate only the first double. */ ++ #undef NWORDS ++ #define NWORDS \ ++ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) ++#endif ++ + memory_long_double m; + m.value = NaNl (); + # if LDBL_EXPBIT0_BIT > 0 +--- a/libmissing/tests/test-signbit.c ++++ b/libmissing/tests/test-signbit.c +@@ -151,6 +151,16 @@ test_signbitl () + #define NWORDS \ + ((sizeof (long double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) + typedef union { long double value; unsigned int word[NWORDS]; } memory_long_double; ++ ++#if defined __powerpc__ && LDBL_MANT_DIG == 106 ++ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are ++ represented as the corresponding 64-bit IEEE values in the first double; ++ the second is ignored. Manipulate only the first double. */ ++ #undef NWORDS ++ #define NWORDS \ ++ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) ++#endif ++ + memory_long_double m; + m.value = zerol / zerol; + # if LDBL_EXPBIT0_BIT > 0 diff -Nru libprelude-1.0.0/debian/patches/series libprelude-1.0.0/debian/patches/series --- libprelude-1.0.0/debian/patches/series 2014-05-25 15:58:53.000000000 +0200 +++ libprelude-1.0.0/debian/patches/series 2014-08-15 07:27:04.000000000 +0200 @@ -5,3 +5,5 @@ request_REUSEADDR_before_bind.patch test-poll_add_sleep_after_write.patch keep-atfork-symbol.patch +010_gnutlsextrainclude.diff +016_ppc64el-isnan-tests-fix-for-little-endian-PowerPC.patch
signature.asc
Description: Digital signature
