Your message dated Sun, 06 Apr 2014 17:18:35 +0000
with message-id <[email protected]>
and subject line Bug#731604: fixed in gkrellm 2.3.5-6
has caused the Debian Bug report #731604,
regarding gkrellm: Please build-depend on libgnutls-openssl-dev
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
731604: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731604
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: gkrellm
Version: 2.3.5-5
Severity: normal
Tags: patch
Hello,
please change the package's build-dependency from libgnutls-dev to
libgnutls-openssl-dev. The latter is a virtual package provided by
libgnutls-dev in sid and libgnutls28-dev in experimental. Having the
reverse dependencies change should allow us to transition to the newer
version. (See #726828.)
Find attached a patch that
a) changes the build-depency
b) stops the unnecessary linkage against gcrypt.
I have test-built the patched package against both libgnutls-dev/sid
and libgnutls28-dev/experimental to verify that continues to build
against GnuTLS 3.x.
Thanks, 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 gkrellm-2.3.5/debian/changelog gkrellm-2.3.5/debian/changelog
--- gkrellm-2.3.5/debian/changelog 2013-06-29 23:50:21.000000000 +0200
+++ gkrellm-2.3.5/debian/changelog 2013-12-07 15:10:54.000000000 +0100
@@ -1,3 +1,14 @@
+gkrellm (2.3.5-5.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Pull 11_Only-use-Libgcrypt-for-GnuTLS-2.12.patch and
+ 12_Do-not-include-gcrypt.h-for-newer-GnuTLS-versions.patch from upstream
+ GIT to stop unnecessary linkage against libgcrypt. Closes: #638646
+ * Build-Depend on libgnutls-openssl-dev instead of libgnutls-dev to allow
+ transitioning to newer GnuTLS.
+
+ -- Andreas Metzler <[email protected]> Fri, 06 Dec 2013 19:27:09 +0100
+
gkrellm (2.3.5-5) unstable; urgency=low
* Upload to unstable
diff -Nru gkrellm-2.3.5/debian/control gkrellm-2.3.5/debian/control
--- gkrellm-2.3.5/debian/control 2013-06-29 23:50:21.000000000 +0200
+++ gkrellm-2.3.5/debian/control 2013-12-06 19:27:46.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sandro Tosi <[email protected]>
Standards-Version: 3.9.4
-Build-Depends: libglib2.0-dev, libgtk2.0-dev, debhelper (>= 9), libsm-dev, x11proto-core-dev, gettext, libgnutls-dev, libntlm0-dev, libsensors4-dev
+Build-Depends: libglib2.0-dev, libgtk2.0-dev, debhelper (>= 9), libsm-dev, x11proto-core-dev, gettext, libgnutls-openssl-dev, libntlm0-dev, libsensors4-dev
Vcs-Git: git://anonscm.debian.org/collab-maint/gkrellm.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gkrellm.git
Homepage: http://gkrellm.net/
diff -Nru gkrellm-2.3.5/debian/patches/11_Only-use-Libgcrypt-for-GnuTLS-2.12.patch gkrellm-2.3.5/debian/patches/11_Only-use-Libgcrypt-for-GnuTLS-2.12.patch
--- gkrellm-2.3.5/debian/patches/11_Only-use-Libgcrypt-for-GnuTLS-2.12.patch 1970-01-01 01:00:00.000000000 +0100
+++ gkrellm-2.3.5/debian/patches/11_Only-use-Libgcrypt-for-GnuTLS-2.12.patch 2013-12-07 15:11:49.000000000 +0100
@@ -0,0 +1,72 @@
+From 752e5965b197d70a9125dc3319a8c5e5673a8f8b Mon Sep 17 00:00:00 2001
+From: Stefan Gehn <[email protected]>
+Date: Sat, 27 Aug 2011 16:32:31 +0200
+Subject: [PATCH 1/3] Only use Libgcrypt for GnuTLS < 2.12
+
+Only initialize Libgcrypt threading functions on GnuTLS < 2.12 which
+does not do this automatically. Also drop explicit linking against
+Libgcrypt on newer GnuTLS version.
+
+This should allow GKrellM to work with a GnuTLS that uses Nettle instead
+of Libgcrypt as its cryptographic backend.
+---
+ Changelog | 3 +++
+ src/configure | 7 ++++++-
+ src/mail.c | 8 ++++++++
+ 3 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/src/configure b/src/configure
+index bfe29c6..620f1e9 100755
+--- a/src/configure
++++ b/src/configure
+@@ -96,7 +96,12 @@ echo -n "Checking for gnutls... "
+ echo "Checking for gnutls... " 1>& 5
+
+ GNUTLS_INCLUDE="$(pkg-config gnutls --cflags 2>& 5 || true)"
+-GNUTLS_LIBS="$(pkg-config gnutls --libs 2>& 5 || true) -lgnutls-openssl -lgcrypt"
++GNUTLS_LIBS="$(pkg-config gnutls --libs 2>& 5 || true) -lgnutls-openssl"
++
++# GnuTLS >= 2.12 does not need explicit gcrypt linking anymore
++if $(pkg-config --max-version=2.11.99 gnutls 2>& 5 || false); then
++ GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
++fi
+
+ cat << EOF > test.c
+ #include <gnutls/openssl.h>
+diff --git a/src/mail.c b/src/mail.c
+index a4e04bf..3ae5227 100644
+--- a/src/mail.c
++++ b/src/mail.c
+@@ -51,6 +51,9 @@
+ #define MD5Update MD5_Update
+ #define MD5Final MD5_Final
+
++#if GNUTLS_VERSION_NUMBER <= 0x020b00
++/* gcrypt mutex setup is only needed for GnuTLS < 2.12 */
++
+ static int gk_gcry_glib_mutex_init (void **priv) {
+ GMutex *lock = g_mutex_new();
+ if (!lock)
+@@ -90,6 +93,8 @@ static struct gcry_thread_cbs gk_gcry_threads_glib = {
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
+ };
+
++#endif
++
+ #else
+
+ #if defined(HAVE_SSL)
+@@ -4340,7 +4345,10 @@ gkrellm_init_mail_monitor(void)
+ _GK.decal_mail_delay = 1;
+
+ #ifdef HAVE_GNUTLS
++#if GNUTLS_VERSION_NUMBER <= 0x020b00
++ /* gcrypt mutex setup, only needed for GnuTLS < 2.12 */
+ gcry_control (GCRYCTL_SET_THREAD_CBS, &gk_gcry_threads_glib);
++#endif
+ gnutls_global_init();
+ SSL_load_error_strings();
+ SSL_library_init();
+--
+1.7.10.4
+
diff -Nru gkrellm-2.3.5/debian/patches/12_Do-not-include-gcrypt.h-for-newer-GnuTLS-versions.patch gkrellm-2.3.5/debian/patches/12_Do-not-include-gcrypt.h-for-newer-GnuTLS-versions.patch
--- gkrellm-2.3.5/debian/patches/12_Do-not-include-gcrypt.h-for-newer-GnuTLS-versions.patch 1970-01-01 01:00:00.000000000 +0100
+++ gkrellm-2.3.5/debian/patches/12_Do-not-include-gcrypt.h-for-newer-GnuTLS-versions.patch 2013-12-07 15:10:47.000000000 +0100
@@ -0,0 +1,56 @@
+From fdc17315b719320aae7e77a5f482b4865cd2f4d9 Mon Sep 17 00:00:00 2001
+From: Stefan Gehn <[email protected]>
+Date: Sat, 26 Nov 2011 20:00:53 +0100
+Subject: [PATCH 2/3] Do not include gcrypt.h for newer GnuTLS versions
+
+Not linking against Libgcrypt is not enough, we also should not try to
+include headers. This fixes GnuTLS >= 2.12 detection when Libgcrypt
+headers are not installed/found.
+---
+ src/configure | 4 +++-
+ src/mail.c | 3 ++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/configure b/src/configure
+index 620f1e9..1be1c27 100755
+--- a/src/configure
++++ b/src/configure
+@@ -99,13 +99,15 @@ GNUTLS_INCLUDE="$(pkg-config gnutls --cflags 2>& 5 || true)"
+ GNUTLS_LIBS="$(pkg-config gnutls --libs 2>& 5 || true) -lgnutls-openssl"
+
+ # GnuTLS >= 2.12 does not need explicit gcrypt linking anymore
++gcrypt_h=""
+ if $(pkg-config --max-version=2.11.99 gnutls 2>& 5 || false); then
+ GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
++ gcrypt_h="#include <gcrypt.h>"
+ fi
+
+ cat << EOF > test.c
+ #include <gnutls/openssl.h>
+-#include <gcrypt.h>
++$gcrypt_h
+ #include <errno.h>
+
+ int main()
+diff --git a/src/mail.c b/src/mail.c
+index 3ae5227..fa410a2 100644
+--- a/src/mail.c
++++ b/src/mail.c
+@@ -46,12 +46,13 @@
+
+ #if defined(HAVE_GNUTLS)
+ #include <gnutls/openssl.h>
+-#include <gcrypt.h>
++
+ #define MD5Init MD5_Init
+ #define MD5Update MD5_Update
+ #define MD5Final MD5_Final
+
+ #if GNUTLS_VERSION_NUMBER <= 0x020b00
++#include <gcrypt.h>
+ /* gcrypt mutex setup is only needed for GnuTLS < 2.12 */
+
+ static int gk_gcry_glib_mutex_init (void **priv) {
+--
+1.7.10.4
+
diff -Nru gkrellm-2.3.5/debian/patches/series gkrellm-2.3.5/debian/patches/series
--- gkrellm-2.3.5/debian/patches/series 2013-06-29 23:50:21.000000000 +0200
+++ gkrellm-2.3.5/debian/patches/series 2013-12-07 15:10:47.000000000 +0100
@@ -3,3 +3,5 @@
05_bts437033_fix_strip.patch
06_bts646262_add_format_string_to_syslog_call.patch
10_fix_glib_underlinkage.patch
+11_Only-use-Libgcrypt-for-GnuTLS-2.12.patch
+12_Do-not-include-gcrypt.h-for-newer-GnuTLS-versions.patch
--- End Message ---
--- Begin Message ---
Source: gkrellm
Source-Version: 2.3.5-6
We believe that the bug you reported is fixed in the latest version of
gkrellm, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Sandro Tosi <[email protected]> (supplier of updated gkrellm package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 06 Apr 2014 19:05:07 +0200
Source: gkrellm
Binary: gkrellm gkrellmd
Architecture: source amd64
Version: 2.3.5-6
Distribution: unstable
Urgency: low
Maintainer: Sandro Tosi <[email protected]>
Changed-By: Sandro Tosi <[email protected]>
Description:
gkrellm - GNU Krell Monitors
gkrellmd - GNU Krell Monitors Server
Closes: 638646 731604
Changes:
gkrellm (2.3.5-6) unstable; urgency=low
.
[ Andreas Metzler ]
* Pull 11_Only-use-Libgcrypt-for-GnuTLS-2.12.patch and
12_Do-not-include-gcrypt.h-for-newer-GnuTLS-versions.patch from upstream
GIT to stop unnecessary linkage against libgcrypt. Closes: #638646
* Build-Depend on libgnutls-openssl-dev instead of libgnutls-dev to allow
transitioning to newer GnuTLS; Closes: #731604
.
[ Sandro Tosi ]
* bump Standards-Version to 3.9.5 (no changes needed)
Checksums-Sha1:
0b57c997f91fab415c6c4ed40362c66c9134682a 1336 gkrellm_2.3.5-6.dsc
56a57437eb22e38b776049fad4c70b187a8c32f5 16448 gkrellm_2.3.5-6.debian.tar.xz
c86b19f5746167f31bdcfb73d96d73d4db2151c3 560474 gkrellm_2.3.5-6_amd64.deb
0b301a4ce447b3ca819a5e836a1f5c7f790ff634 111356 gkrellmd_2.3.5-6_amd64.deb
Checksums-Sha256:
4d0d11a081435b89afe83d6adcb9d6f4d401b4f0828ab663be4f6bcd53b518ba 1336
gkrellm_2.3.5-6.dsc
bf14824bd56f66b38dc77d53e586045ade041b7500380600fce83a4169bf87e4 16448
gkrellm_2.3.5-6.debian.tar.xz
101ca3f24e39af13ac6450b15f00d4044e1d34f22eeb3f7f20d0c6e003e67b58 560474
gkrellm_2.3.5-6_amd64.deb
e4bd8e992182f7430cf32ab5df717954d9c02597c21fe82be757b00d6504d99d 111356
gkrellmd_2.3.5-6_amd64.deb
Files:
cff529f371e3de41ff8a5cee6ccfa50e 1336 x11 optional gkrellm_2.3.5-6.dsc
4af09812c922acea7383bb7d5cea5ec7 16448 x11 optional
gkrellm_2.3.5-6.debian.tar.xz
9a1e11f3d2ecc120c76a8ff4f2362672 560474 x11 optional gkrellm_2.3.5-6_amd64.deb
ec61a4ac4d1ee12701f4479be8a44940 111356 x11 optional gkrellmd_2.3.5-6_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iEYEARECAAYFAlNBic8ACgkQAukwV0RN2VAvGgCfRmGJDuYEIB2QNn3WOXsgzzMr
v40AnRxF3unZK4EcV6z8VRYX1Q177BfX
=8rNV
-----END PGP SIGNATURE-----
--- End Message ---
