Your message dated Sun, 27 Jul 2014 16:34:29 +0000
with message-id <[email protected]>
and subject line Bug#746159: fixed in webfs 1.21+ds1-10
has caused the Debian Bug report #746159,
regarding webfs: gcrypt dependency only needed for older gnutls versions
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.)
--
746159: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746159
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: webfs
Version: 1.21+ds1-9
Severity: normal
User: [email protected]
Usertags: gnutls3
webfs necessarily links against and #includes gcrypt even when it is
not necessary.
1. The pthreads locking is now used by default in gnutls. [1]
2. Gnutls >= 3 does not use gcrypt as crypto backend, so there is no
point in setting gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0) when
newer gnutls versions are used because webfs itself does not use
gcrypt directly.
The respective parts of the file (especially #include <gcrypt.h>)
should conditional on a correct #if GNUTLS_VERSION_NUMBER <= setting
and the makefile should stop linking against gcrypt for gnutls >=3.
cu Andreas
[1] gnutls 2.12 release announcement:
** libgnutls: Added gnutls_global_set_mutex() to allow setting
alternative locking procedures. By default the system available
locking is used. In *NIX pthreads are used and in windows the
critical section API. This follows a different approach than the
previous versions that depended on libgcrypt initialization. The
locks are now set by default in systems that support it. Programs
that used gcry_control() to set thread locks should insert it into
a block of
#if GNUTLS_VERSION_NUMBER <= 0x020b00
gcry_control(...)
#endif
--
`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 xxxterm-1.11.3/debian/changelog xxxterm-1.11.3/debian/changelog
--- xxxterm-1.11.3/debian/changelog 2013-12-24 00:03:35.000000000 +0100
+++ xxxterm-1.11.3/debian/changelog 2014-04-27 15:37:45.000000000 +0200
@@ -1,3 +1,11 @@
+xxxterm (1:1.11.3-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * 0007-Unnecessary-gcrypt-requirement.diff: Only link against and #include
+ gcrypt for gnutls < 2.12.
+
+ -- Andreas Metzler <[email protected]> Sun, 27 Apr 2014 15:37:04 +0200
+
xxxterm (1:1.11.3-1.2) unstable; urgency=medium
* Non-maintainer upload
diff -Nru xxxterm-1.11.3/debian/patches/0007-Unnecessary-gcrypt-requirement.diff xxxterm-1.11.3/debian/patches/0007-Unnecessary-gcrypt-requirement.diff
--- xxxterm-1.11.3/debian/patches/0007-Unnecessary-gcrypt-requirement.diff 1970-01-01 01:00:00.000000000 +0100
+++ xxxterm-1.11.3/debian/patches/0007-Unnecessary-gcrypt-requirement.diff 2014-04-27 15:36:34.000000000 +0200
@@ -0,0 +1,54 @@
+Description: Drop unnecessary gcrypt requirement
+ Only link against and #include gcrypt for gnutls < 2.12.
+Author: Andreas Metzler <[email protected]>
+Origin: vendor
+Last-Update: 2014-04-27
+
+--- xxxterm-1.11.3.orig/linux/Makefile
++++ xxxterm-1.11.3/linux/Makefile
+@@ -1,7 +1,8 @@
+ LIBS= gtk+-2.0 webkit-1.0 libsoup-2.4 gnutls gthread-2.0
+
++REQUIREGCRYPT := $(shell if pkg-config --exists 'gnutls < 2.12' ; then echo "-lgcrypt" ; fi )
+ CFLAGS+= -O2 -Wall -ggdb3 -D_GNU_SOURCE -I. -I.. $(shell pkg-config --cflags $(LIBS))
+-LDADD+= $(shell pkg-config --libs $(LIBS)) -lbsd -ldl -lgcrypt
++LDADD+= $(shell pkg-config --libs $(LIBS)) -lbsd -ldl $(REQUIREGCRYPT)
+
+ PREFIX?= /usr/local
+ BINDIR?= $(PREFIX)/bin
+--- xxxterm-1.11.3.orig/xxxterm.c
++++ xxxterm-1.11.3/xxxterm.c
+@@ -49,8 +49,10 @@ uint32_t swm_debug = 0
+ #endif
+
+ #ifdef USE_THREADS
++#if GNUTLS_VERSION_NUMBER <= 0x020b00
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ #endif
++#endif
+
+ char *icons[] = {
+ "xxxtermicon16.png",
+@@ -7602,8 +7604,10 @@ main(int argc, char **argv)
+ gdk_threads_init();
+ gdk_threads_enter();
+
++#if GNUTLS_VERSION_NUMBER <= 0x020b00
+ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+ #endif
++#endif
+ gtk_init(&argc, &argv);
+
+ gnutls_global_init();
+--- xxxterm-1.11.3.orig/xxxterm.h
++++ xxxterm-1.11.3/xxxterm.h
+@@ -78,7 +78,9 @@ u_int32_t arc4random_uniform(u_int32_t);
+ #define USE_THREADS
+
+ #ifdef USE_THREADS
++#if GNUTLS_VERSION_NUMBER <= 0x020b00
+ #include <gcrypt.h>
++#endif
+ #include <pthread.h>
+ #endif
+
diff -Nru xxxterm-1.11.3/debian/patches/series xxxterm-1.11.3/debian/patches/series
--- xxxterm-1.11.3/debian/patches/series 2013-12-23 23:19:27.000000000 +0100
+++ xxxterm-1.11.3/debian/patches/series 2014-04-27 15:34:47.000000000 +0200
@@ -4,3 +4,4 @@
0004-Fix-lintian-error-hyphen-used-as-minus-sign.patch
0005-Fix-Icon-path-in-desktop-file.patch
0006-Add-missing-includes.patch
+0007-Unnecessary-gcrypt-requirement.diff
--- End Message ---
--- Begin Message ---
Source: webfs
Source-Version: 1.21+ds1-10
We believe that the bug you reported is fixed in the latest version of
webfs, 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.
Mats Erik Andersson <[email protected]> (supplier of updated webfs
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: SHA256
Format: 1.8
Date: Sat, 26 Jul 2014 21:37:53 +0200
Source: webfs
Binary: webfs
Architecture: source amd64
Version: 1.21+ds1-10
Distribution: unstable
Urgency: low
Maintainer: Mats Erik Andersson <[email protected]>
Changed-By: Mats Erik Andersson <[email protected]>
Description:
webfs - lightweight HTTP server for static content
Closes: 730376 746159 752302
Changes:
webfs (1.21+ds1-10) unstable; urgency=low
.
* debian/control: Standard-Version 3.9.5.
* Make libgcrypt a conditional dependency.
+ Solution hint provided by Andreas Metzler.
+ debian/patches/85_conditional_gcrypt.diff: New file.
+ debian/control: Add 'pkg-config' to Build-Depends.
+ Closes: #746159
* Migrate to recent 'gnutls28'.
+ debian/control: Update to 'libgnutls28-dev' in Build-Depends.
+ Closes: #752302
* Set default document root to '/var/www/html'.
+ debian/templates: Updated.
+ Closes: #730376
* Support sendfile() while running GNU/kFreeBSD.
+ debian/patches/82_kfreebsd.diff: New file.
* Document the option "-~" properly.
+ debian/patches/10_manpage.diff: Updated.
Checksums-Sha1:
16ec7567e6d6dcc7bc623bf39124e9878c8bcad0 1795 webfs_1.21+ds1-10.dsc
50c3c163165b11329fb001f550207037f5bd3d7e 55828 webfs_1.21+ds1-10.debian.tar.xz
6807ea9f92ad0a9670c4a076976736e4b24dbe06 72276 webfs_1.21+ds1-10_amd64.deb
Checksums-Sha256:
dceefa18cda055686f5c115a86d5b83f528a91ff3f4a7f322042172833d1c8c2 1795
webfs_1.21+ds1-10.dsc
e9b0ad37832cd0aa5fa0d8a6c970d3ff1d4c9daa512ca5489c14552043207899 55828
webfs_1.21+ds1-10.debian.tar.xz
12a2240deb71e943de6167ea478ee3613c5aac79dfe8e484b4724677705df07a 72276
webfs_1.21+ds1-10_amd64.deb
Files:
883baa4584697190f0022371a30f4c29 72276 httpd optional
webfs_1.21+ds1-10_amd64.deb
66ddfadea22b5411f60f176165370cea 1795 httpd optional webfs_1.21+ds1-10.dsc
e5f415b99b899c5cf5355abcb5ae21a3 55828 httpd optional
webfs_1.21+ds1-10.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJT1SjFAAoJEKbcJNnaJJPRD9IP/R1N/p3wwaLx8MBlIQKPZwsj
/JqgrQ3mcECbLEMoa6Atr6GjyBDJXTgxZTfmmFVAh+wcYEaAf4fJ7HEEtg5pDjLb
E/wrT73Rov/98KL6R575pupvrTuw6Ikfg2ZuIuFE+6FajQHQbQvzfq+jhU6XmCNG
4wbrY+YPUNDlt0tH/7cNlexycD8uBAFEqT3D1JGeLhJxY+2cmetLZsWZbJvp8MQf
HRgiXVNQiYKEMmb3eZkg9/c/nkYAJW54siznIRwruhIUuU9O7uYEt/kZiQ0AFo4v
VMZEr0MsMboi8NSGUCzEUsLgh6mG34nAlmL/FtyPGDx8VS3rZubSn6Q22AK13UqA
HCITf1qmtltZypsLITGDOg8cTHlVv2bx6tD7VC8/7QLGNCXKpUuPGKJDWXq3rnCq
C4rki6eGTy/pP5dNx6/Y3RgY2hI+UeuvhAJVxko1MBMKhVHbym4DK3PphrW0+NwU
oNP+ziYHa+wrdD/BBlBB6ZV6E/w/hdOzKAEh83YSghZq9KxYeIv39/n32zJQECaW
jQ/a7VY3Eny8Efie/JYF/mq4SlUqm/yFV3f21e5Y9VblOIzo+YKAGrQm8iibzLEL
zDC2rXvk5FjTDKQtrXafYQEuR0zCR+BEA9+jYsgE84vCt0McXhhBu3Rmc4COodbM
jmi4bP1ywYiVie36LiQ9
=Ztz5
-----END PGP SIGNATURE-----
--- End Message ---
