Your message dated Tue, 14 Jun 2005 21:42:43 -0400
with message-id <[EMAIL PROTECTED]>
and subject line changes merged in 2.2.7-2
has caused the attached Bug report 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 I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 14 May 2005 14:20:57 +0000
>From [EMAIL PROTECTED] Sat May 14 07:20:56 2005
Return-path: <[EMAIL PROTECTED]>
Received: from 177.221.97-84.rev.gaoland.net (babasse.is-a-geek.org)
[84.97.221.177]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DWxVg-0001ew-00; Sat, 14 May 2005 07:20:56 -0700
Received: from smimram by babasse.is-a-geek.org with local (Exim 4.50)
id 1DWxVe-0003TI-8K; Sat, 14 May 2005 16:20:54 +0200
Content-Type: multipart/mixed; boundary="===============1293405875=="
MIME-Version: 1.0
From: Samuel Mimram <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: gkrellm is under GPL and is linked with openssl
X-Mailer: reportbug 3.12
Date: Sat, 14 May 2005 16:20:54 +0200
Message-Id: <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
This is a multi-part MIME message sent by reportbug.
--===============1293405875==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Package: gkrellm
Version: 2.2.5-1
Severity: serious
Hi,
Gkrellm is under the GPL license which is considered not compatible with
openssl's license (see [1], [2], [3]). Therefore it should not be linked with
this library.
However I have recently sent a patch upstream which was integrated in
the 2.2.6 version for gkrellm to be able to be linked with gnutls
(attaced to this mail). So, could you please use this version and link with
gnutls?
Thanks.
Regards,
Samuel.
[1] http://www.gnome.org/~markmc/openssl-and-the-gpl.html
[2] http://lists.debian.org/debian-legal/2002/04/msg00072.html
[3] http://www.openssl.org/support/faq.html#LEGAL2
-- System Information:
Debian Release: 3.1
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Versions of packages gkrellm depends on:
ii gkrellm-common 2.2.5-1 multiple stacked system monitors:
ii libatk1.0-0 1.8.0-4 The ATK accessibility toolkit
ii libc6 2.3.2.ds1-22 GNU C Library: Shared libraries an
ii libglib2.0-0 2.6.4-1 The GLib library of C routines
ii libgtk2.0-0 2.6.4-3 The GTK+ graphical user interface
ii libice6 4.3.0.dfsg.1-13 Inter-Client Exchange library
ii libpango1.0-0 1.8.1-1 Layout and rendering of internatio
ii libsm6 4.3.0.dfsg.1-13 X Window System Session Management
ii libssl0.9.7 0.9.7g-1 SSL shared libraries
ii libx11-6 4.3.0.dfsg.1-13 X Window System protocol client li
ii xlibs 4.3.0.dfsg.1-13 X Keyboard Extension (XKB) configu
-- no debconf information
--===============1293405875==
Content-Type: text/x-c; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="gkrellm-gnutls.diff"
diff -ru ../gkrellm-2.2.5.orig/src/configure ./src/configure
--- ../gkrellm-2.2.5.orig/src/configure 2005-05-06 22:57:44.000000000 +0200
+++ ./src/configure 2005-05-06 23:39:38.000000000 +0200
@@ -7,6 +7,10 @@
for i
do
+ if [ "$i" = "--without-gnutls" ]
+ then
+ without_gnutls=yes
+ fi
if [ "$i" = "--without-ssl" ]
then
without_ssl=yes
@@ -24,6 +28,46 @@
exec 5>./configure.log
+if [ "$without_gnutls" != "yes" ]
+then
+# echo "Checking for gnutls... " 1>& 2
+echo "Checking for gnutls... " 1>& 5
+
+cat << EOF > test.c
+#include <gnutls/openssl.h>
+
+int main()
+ {
+ SSL_METHOD *ssl_method = NULL;
+
+ SSLeay_add_ssl_algorithms();
+ SSL_load_error_strings();
+ if ((ssl_method = SSLv23_client_method()) == NULL)
+ return 1;
+ return 0;
+ }
+EOF
+
+$CC ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
+$CC test.o -o test ${PKG_LIBS} -lgnutls-openssl 2>& 5
+
+if [ -e ./test ] && ./test
+then
+# echo 'Defining HAVE_GNUTLS' 1>& 2
+ echo 'Defining HAVE_GNUTLS' 1>& 5
+ echo '#define HAVE_GNUTLS 1' >> configure.h
+ echo '#define HAVE_SSL 1' >> configure.h
+ without_ssl=yes
+else
+# echo "Not found, mail check will not have gnutls support..." 1>& 2
+ echo "Not found, mail check will not have gnutls support..." 1>& 5
+fi
+fi
+# end of gnutls check
+
+rm -f test test.o test.c
+
+
if [ "$without_ssl" != "yes" ]
then
# echo "Checking for ssl... " 1>& 2
diff -ru ../gkrellm-2.2.5.orig/src/mail.c ./src/mail.c
--- ../gkrellm-2.2.5.orig/src/mail.c 2005-05-06 22:57:44.000000000 +0200
+++ ./src/mail.c 2005-05-06 23:57:59.000000000 +0200
@@ -37,6 +37,12 @@
#define HAVE_MD5_H
#endif
+#if defined(HAVE_GNUTLS)
+#include <gnutls/openssl.h>
+#define MD5Init MD5_Init
+#define MD5Update MD5_Update
+#define MD5Final MD5_Final
+#else
#if defined(HAVE_SSL)
#include <openssl/ssl.h>
#include <openssl/md5.h>
@@ -50,6 +56,7 @@
#include "md5.h"
#endif
#endif
+#endif
#include "ntlm.h"
@@ -641,8 +648,10 @@
tcp_close(ConnInfo *conn)
{
#ifdef HAVE_SSL
+#ifndef HAVE_GNUTLS
SSL_SESSION *session;
#endif
+#endif
if (conn->fd != -1)
{
@@ -656,9 +665,11 @@
#ifdef HAVE_SSL
if (conn->ssl)
{
+#ifndef HAVE_GNUTLS
session = SSL_get_session(conn->ssl);
if (session)
SSL_CTX_remove_session(conn->ssl_ctx, session);
+#endif
SSL_free(conn->ssl);
conn->ssl = NULL;
}
@@ -707,7 +718,7 @@
SSL_load_error_strings();
if (mbox->account->use_ssl == SSL_TRANSPORT)
- ssl_method = SSLv2_client_method();
+ ssl_method = SSLv23_client_method();
else
ssl_method = TLSv1_client_method();
if (ssl_method == NULL)
@@ -724,7 +735,9 @@
return tcp_shutdown(conn, mbox,
N_("Cannot initialize SSL handler."),
FALSE);
+#ifndef HAVE_GNUTLS
SSL_clear(conn->ssl);
+#endif
SSL_set_fd(conn->ssl, conn->fd);
SSL_set_connect_state(conn->ssl);
diff -ru ../gkrellm-2.2.5.orig/src/Makefile ./src/Makefile
--- ../gkrellm-2.2.5.orig/src/Makefile 2005-05-06 22:57:44.000000000 +0200
+++ ./src/Makefile 2005-05-06 23:42:45.000000000 +0200
@@ -19,6 +19,12 @@
LINK_FLAGS ?= -Wl,-E
SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
+ifeq ($(without-gnutls),1)
+ CONFIGURE_ARGS += --without-gnutls
+endif
+ifeq ($(without-gnutls),yes)
+ CONFIGURE_ARGS += --without-gnutls
+endif
ifeq ($(without-ssl),1)
CONFIGURE_ARGS += --without-ssl
endif
@@ -28,13 +34,18 @@
DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
+HAVE_GNUTLS = $(shell grep -c HAVE_GNUTLS configure.h)
HAVE_SSL = $(shell grep -c HAVE_SSL configure.h)
+ifeq ($(HAVE_GNUTLS),1)
+ SSL_LIBS ?= -lgnutls-openssl
+else
ifeq ($(HAVE_SSL),1)
SSL_LIBS ?= -lssl -lcrypto
else
EXTRAOBJS ?= md5c.o
endif
+endif
CC ?= gcc
STRIP ?= -s
--===============1293405875==--
---------------------------------------
Received: (at 309089-done) by bugs.debian.org; 15 Jun 2005 01:42:45 +0000
>From [EMAIL PROTECTED] Tue Jun 14 18:42:45 2005
Return-path: <[EMAIL PROTECTED]>
Received: from master.debian.org [146.82.138.7]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DiMvV-0005fC-00; Tue, 14 Jun 2005 18:42:45 -0700
Received: from bma by master.debian.org with local (Exim 3.35 1 (Debian))
id 1DiMvU-00014P-00; Tue, 14 Jun 2005 20:42:44 -0500
Date: Tue, 14 Jun 2005 21:42:43 -0400
From: Brian Almeida <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: changes merged in 2.2.7-2
Message-ID: <[EMAIL PROTECTED]>
Reply-To: [EMAIL PROTECTED]
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.28i
Sender: Brian Almeida <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no
version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
The NMU changes have been integrated in latest gkrellm package (2.2.7-2)
Thanks for taking care of it in my absence.
Brian
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
