Fix building of Shishi with libgcrypt 1.6 and later.

Patch copied from Debian:

https://anonscm.debian.org/cgit/collab-maint/shishi.git/tree/debian/patches/fix_gcrypt_detection.diff?id=948301ae648a542a408da250755aeed58a6e3542

Description: Fix autoconf gnutls detection to also accept gcrypt 1.6.
Author: Andreas Metzler <ametzler@debian.org>
Bug-Debian: http://bugs.debian.org/753150
Origin: vendor
Forwarded: no
Last-Update: 2014-07-18

--- shishi-1.0.2.orig/gl/m4/gc.m4
+++ shishi-1.0.2/gl/m4/gc.m4
@@ -12,10 +12,12 @@ AC_DEFUN([gl_GC],
   if test "$libgcrypt" != no; then
     AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
 #include <gcrypt.h>
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
-   will fail on startup if we don't have 1.4.4 or later, so
-   test for it early. */
-#if !defined GCRY_MODULE_ID_USER
+/* gc-libgcrypt.c will fail on startup if we don't have libgcrypt 1.4.4 or
+   later, test for it early. by checking for either
+   - GCRY_MODULE_ID_USER which was added in 1.4.4 and dropped in 1.6 or
+   - GCRYPT_VERSION_NUMBER which was added in 1.6.
+   */
+#if !defined GCRY_MODULE_ID_USER && !defined GCRYPT_VERSION_NUMBER
 error too old libgcrypt
 #endif
 ])
href='/guix/log/gnu/packages/patches/unzip-overflow.patch'>log</a><a href='/guix/tree/gnu/packages/patches/unzip-overflow.patch?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6'>tree</a><a href='/guix/commit/gnu/packages/patches/unzip-overflow.patch?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6'>commit</a><a href='/guix/diff/gnu/packages/patches/unzip-overflow.patch?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/unzip-overflow.patch'>
<input type='hidden' name='id' value='069399ee9dbf75b7c89583f03346a63b2cfe4ac6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6'>root</a>/<a href='/guix/log/gnu?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6'>gnu</a>/<a href='/guix/log/gnu/packages?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6'>patches</a>/<a href='/guix/log/gnu/packages/patches/unzip-overflow.patch?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6'>unzip-overflow.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/unzip-overflow.patch?id=069399ee9dbf75b7c89583f03346a63b2cfe4ac6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-03-14 06:11:20 +0100'>2021-03-14</span></td><td><a href='/guix/commit/gnu/packages/patches/unzip-overflow.patch?id=31d289a4759909d24dd309ac24d42902a8c20da0'>gnu: unzip: Add patches from Fedora [security fixes].</a><span class='msg-avail'>...<span class='msg-tooltip'>Non-exhaustively fixes CVE-2016-9844, CVE-2018-1000035, CVE-2018-18384, and
CVE-2019-13232.

* gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch,
gnu/packages/patches/unzip-CVE-2016-9844.patch,
gnu/packages/patches/unzip-CVE-2018-1000035.patch,
gnu/packages/patches/unzip-CVE-2018-18384.patch,
gnu/packages/patches/unzip-case-insensitive.patch,
gnu/packages/patches/unzip-alt-iconv-utf8-print.patch,
gnu/packages/patches/unzip-alt-iconv-utf8.patch,
gnu/packages/patches/unzip-close.patch,
gnu/packages/patches/unzip-exec-shield.patch,
gnu/packages/patches/unzip-fix-recmatch.patch,
gnu/packages/patches/unzip-manpage-fix.patch,
gnu/packages/patches/unzip-overflow.patch,
gnu/packages/patches/unzip-symlink.patch,
gnu/packages/patches/unzip-timestamp.patch,
gnu/packages/patches/unzip-valgrind.patch,
gnu/packages/patches/unzip-x-option.patch,
gnu/packages/patches/unzip-zipbomb-manpage.patch,
gnu/packages/patches/unzip-zipbomb-part1.patch,
gnu/packages/patches/unzip-zipbomb-part2.patch,
gnu/packages/patches/unzip-zipbomb-part3.patch: New patches.
* gnu/local.mk (dist_patch_DATA): Register them.
* gnu/packages/compression.scm (unzip/fixed): New variable. Apply patches.
(unzip)[replacement]: Graft.
</span></span></td><td>Léo Le Bouter</td></tr>