01/03: gnu: shishi: Update to 1.0.3.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 544ff0b6c2b189b61ae2fa252e6e5233420d06a5
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Aug 7 16:13:36 2022 +0300

    gnu: shishi: Update to 1.0.3.
    
    * gnu/packages/kerberos.scm (shishi): Update to 1.0.3.
    [source]: Remove patch.
    [arguments]: Remove configure flag overriding libgcrypt detection.
    * gnu/packages/patches/shishi-fix-libgcrypt-detection.patch: Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/kerberos.scm                          | 20 ++++++--------
 .../patches/shishi-fix-libgcrypt-detection.patch   | 32 ----------------------
 3 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 88100416d5..bfaa1ea5db 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1815,7 +1815,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/serf-python3.patch                      \
   %D%/packages/patches/shakespeare-spl-fix-grammar.patch               \
   %D%/packages/patches/sharutils-CVE-2018-1000097.patch                \
-  %D%/packages/patches/shishi-fix-libgcrypt-detection.patch    \
   %D%/packages/patches/slim-session.patch                      \
   %D%/packages/patches/slim-config.patch                       \
   %D%/packages/patches/slim-sigusr1.patch                      \
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index dec09ca791..a52d4b42cc 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2012, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
@@ -121,32 +121,28 @@ cryptography.")
 (define-public shishi
   (package
     (name "shishi")
-    (version "1.0.2")
+    (version "1.0.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/shishi/shishi-"
                           version ".tar.gz"))
-      (patches (search-patches "shishi-fix-libgcrypt-detection.patch"))
       (sha256
        (base32
-        "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"))))
+        "14kyj7rdki2g1sj5k42y9v5ya9jar81yw483ivwa80fx2byqyycm"))))
     (build-system gnu-build-system)
     (arguments
-     '(;; This is required since we patch some of the build scripts.
-       ;; Remove first two items for the next Shishi release after 1.0.2 or
-       ;; when removing 'shishi-fix-libgcrypt-detection.patch'.
-       #:configure-flags
-       '("ac_cv_libgcrypt=yes" "--disable-static"
-         "--with-key-dir=/etc/shishi" "--with-db-dir=/var/shishi")
+     '(#:configure-flags
+       '("--disable-static"
+         "--with-key-dir=/etc/shishi"
+         "--with-db-dir=/var/shishi")
        #:phases
        (modify-phases %standard-phases
         (add-after 'configure 'disable-automatic-key-generation
           (lambda* (#:key outputs #:allow-other-keys)
             (substitute* "Makefile"
              (("^install-data-hook:")
-              "install-data-hook:\nx:\n"))
-            #t)))))
+              "install-data-hook:\nx:\n")))))))
     (native-inputs (list pkg-config))
     (inputs
      (list gnutls
diff --git a/gnu/packages/patches/shishi-fix-libgcrypt-detection.patch 
b/gnu/packages/patches/shishi-fix-libgcrypt-detection.patch
deleted file mode 100644
index 3db42feac9..0000000000
--- a/gnu/packages/patches/shishi-fix-libgcrypt-detection.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
- ])