reopen 638412
notfixed 638412 1.7.4-4
tags 638412 patch
thanks

On 2012-05-18 Debian Bug Tracking System <ow...@bugs.debian.org> wrote:
> This is an automatic notification regarding your Bug report
> which was filed against the macopix-gtk2 package:

> #638412: Links against libgcrypt without using gcrypt functions

> It has been closed by Ying-Chun Liu (PaulLiu) <paul...@debian.org>.
[...]

Good morning,

looks like the patch was incomplete:
https://buildd.debian.org/status/fetch.php?pkg=macopix&arch=amd64&ver=1.7.4-4&stamp=1337376404
libtool: link: gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat 
-Werror=format-security -Wl,-z -Wl,relro -o macopix main.o callbacks.o pixmap.o 
gui.o balloon.o clock.o configfile.o utils.o mail.o pop.o md5c.o md5ify.o 
nokkari.o bmp.o bmpwrite.o sockmsg.o codeconv.o unmime.o base64.o 
quoted-printable.o unlha.o untar.o trayicon.o alpha.o ssl.o sslmanager.o dnd.o 
-pthread  -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 
-lpangocairo-1.0 /usr/lib/x86_64-linux-gnu/libcairo.so -lpango-1.0 
/usr/lib/x86_64-linux-gnu/libfreetype.so -lfontconfig -lgthread-2.0 -lrt 
-lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lgnutls -lgcrypt -lgnutls-openssl 
-pthread
make[4]: Leaving directory 
`/build/buildd-macopix_1.7.4-4-amd64-UKOia0/macopix-1.7.4/src'

Find attached a version that works for me.

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 macopix-1.7.4/debian/changelog macopix-1.7.4/debian/changelog
--- macopix-1.7.4/debian/changelog	2014-04-06 15:03:20.000000000 +0200
+++ macopix-1.7.4/debian/changelog	2014-04-27 08:24:49.000000000 +0200
@@ -1,3 +1,11 @@
+macopix (1.7.4-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix 004_dont_link_to_gcrypt.patch to really stop linkage against
+    libgcrypt.
+
+ -- Andreas Metzler <ametz...@debian.org>  Sun, 27 Apr 2014 08:24:35 +0200
+
 macopix (1.7.4-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru macopix-1.7.4/debian/patches/004_dont_link_to_gcrypt.patch macopix-1.7.4/debian/patches/004_dont_link_to_gcrypt.patch
--- macopix-1.7.4/debian/patches/004_dont_link_to_gcrypt.patch	2012-05-18 22:08:53.000000000 +0200
+++ macopix-1.7.4/debian/patches/004_dont_link_to_gcrypt.patch	2014-04-27 08:23:11.000000000 +0200
@@ -3,12 +3,12 @@
  experimental), which does not use gcrypt as crypto backend anymore.
 Bug-Debian: http://bugs.debian.org/638412
 Author: Ying-Chun Liu (PaulLiu) <paul...@debian.org>
-Last-Update: 2012-05-19
-Index: macopix-1.7.4/configure.in
-===================================================================
---- macopix-1.7.4.orig/configure.in	2012-05-19 03:49:05.619363578 +0800
-+++ macopix-1.7.4/configure.in	2012-05-19 04:05:22.669591784 +0800
-@@ -290,7 +290,7 @@
+Last-Update: 2014-04-27
+Origin: vendor
+
+--- macopix-1.7.4.orig/configure.in
++++ macopix-1.7.4/configure.in
+@@ -290,7 +290,7 @@ if test "x$use_gnutls" = "xyes"; then
  
  		AC_CACHE_CHECK([for GnuTLS libraries], gnutls_libs,
  		[
@@ -17,3 +17,12 @@
  			AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no")
  			LIBS="$LIBS_save"
  		])
+@@ -299,7 +299,7 @@ if test "x$use_gnutls" = "xyes"; then
+ 			AC_DEFINE(USE_SSL, 1, Define if you use SSL.)
+ 			AC_DEFINE(USE_GNUTLS, 1, Define if you use GNUTLS to support SSL.)
+ 			msg_gnutls="GnuTLS"
+-			GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt -lgnutls-openssl"
++			GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgnutls-openssl"
+ 
+ 			use_gnutls="yes"
+ 		else

Attachment: signature.asc
Description: Digital signature

Reply via email to