Source: libprelude
Version: 1.0.0-11.2
Severity: normal
Tags: patch
User: ametz...@debian.org
Usertags: gnutls3
Good morning,
Please build libprelude against libgnutls28-dev instead of
libgnutls-dev, the older GnuTLS version should not be part of jessie.
Patch attached.
cu 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 libprelude-1.0.0/debian/changelog libprelude-1.0.0/debian/changelog
--- libprelude-1.0.0/debian/changelog 2014-05-25 15:58:53.000000000 +0200
+++ libprelude-1.0.0/debian/changelog 2014-07-14 07:54:34.000000000 +0200
@@ -1,3 +1,15 @@
+libprelude (1.0.0-11.3) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild against libgnutls28-dev.
+ + Switch (build-)dependency.
+ + Add b-d on libgcrypt20-dev.
+ + 10_noinclude_extra.diff: Do not #include <gnutls/extra.h>
+ unconditionally but only if we are actually linking against
+ gnutls-extra.
+
+ -- Andreas Metzler <ametz...@debian.org> Mon, 14 Jul 2014 07:43:01 +0200
+
libprelude (1.0.0-11.2) unstable; urgency=medium
* 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-07-14 07:44:51.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,7 @@
Package: libprelude-dev
Section: libdevel
Architecture: any
-Depends: libprelude2 (= ${binary:Version}), libgnutls-dev, libltdl3-dev, ${misc:Depends}
+Depends: libprelude2 (= ${binary:Version}), libgnutls28-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/10_noinclude_extra.diff libprelude-1.0.0/debian/patches/10_noinclude_extra.diff
--- libprelude-1.0.0/debian/patches/10_noinclude_extra.diff 1970-01-01 01:00:00.000000000 +0100
+++ libprelude-1.0.0/debian/patches/10_noinclude_extra.diff 2014-07-14 07:53:08.000000000 +0200
@@ -0,0 +1,33 @@
+Description: Don't #include gnutls/extra.h if it not used
+ While configure.ac correctly checks whether linking against
+ libgnutls-extra is needed the header is included unconditionally.
+ This breaks building with GnuTLS v3.
+Author: Andreas Metzler <ametz...@debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2014-07-14
+
+--- libprelude-1.0.0.orig/prelude-admin/prelude-admin.c
++++ libprelude-1.0.0/prelude-admin/prelude-admin.c
+@@ -57,7 +57,9 @@
+ #include <errno.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
++#ifdef NEED_GNUTLS_EXTRA
+ #include <gnutls/extra.h>
++#endif
+
+ #include "common.h"
+ #include "config-engine.h"
+--- libprelude-1.0.0.orig/prelude-admin/server.c
++++ libprelude-1.0.0/prelude-admin/server.c
+@@ -39,7 +39,9 @@
+
+ #include <gcrypt.h>
+ #include <gnutls/gnutls.h>
++#ifdef NEED_GNUTLS_EXTRA
+ #include <gnutls/extra.h>
++#endif
+
+ #include "prelude-client.h"
+ #include "prelude-error.h"
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-07-14 07:50:07.000000000 +0200
@@ -5,3 +5,4 @@
request_REUSEADDR_before_bind.patch
test-poll_add_sleep_after_write.patch
keep-atfork-symbol.patch
+10_noinclude_extra.diff
