CVS commit: [pkgsrc-2025Q4] pkgsrc/security/libgcrypt

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jan 13 00:53:26 UTC 2026

Modified Files:
        pkgsrc/security/libgcrypt [pkgsrc-2025Q4]: distinfo
        pkgsrc/security/libgcrypt/patches [pkgsrc-2025Q4]: patch-cipher_aria.c

Log Message:
Pullup ticket #7042 - requested by nia
security/libgcrypt: Build fix correction

Revisions pulled up:
- security/libgcrypt/distinfo                                   1.103
- security/libgcrypt/patches/patch-cipher_aria.c                1.2

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Fri Jan  9 19:26:57 UTC 2026

   Modified Files:
        pkgsrc/security/libgcrypt: distinfo
        pkgsrc/security/libgcrypt/patches: patch-cipher_aria.c

   Log Message:
   libgcrypt: Fix bswap patch.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.102.4.1 pkgsrc/security/libgcrypt/distinfo
cvs rdiff -u -r1.1 -r1.1.12.1 \
    pkgsrc/security/libgcrypt/patches/patch-cipher_aria.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/libgcrypt/distinfo
diff -u pkgsrc/security/libgcrypt/distinfo:1.102 pkgsrc/security/libgcrypt/distinfo:1.102.4.1
--- pkgsrc/security/libgcrypt/distinfo:1.102    Tue Aug  5 06:08:38 2025
+++ pkgsrc/security/libgcrypt/distinfo  Tue Jan 13 00:53:26 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.102 2025/08/05 06:08:38 adam Exp $
+$NetBSD: distinfo,v 1.102.4.1 2026/01/13 00:53:26 maya Exp $
 
 BLAKE2s (libgcrypt-1.11.2.tar.bz2) = fa7f567dc55b97302991972de130b85737ebb48c115f432d06a0be8a24926049
 SHA512 (libgcrypt-1.11.2.tar.bz2) = b706cea602cc8f0896e57ce979643bf78974b05faec27c1b053b773c57d8b04250e30e95a4ef5899e1df981d01d8d08f0a36e10b5820a5ec4183e74c02e5f1f0
 Size (libgcrypt-1.11.2.tar.bz2) = 4237802 bytes
-SHA1 (patch-cipher_aria.c) = 7e574b13872ea0610bf8b4abd699ffbc9dabc09a
+SHA1 (patch-cipher_aria.c) = dcb6dc45ca601237191ffb8b6b9a0774fe543583
 SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
 SHA1 (patch-config.h.in) = 93dddd3db484230f23450aa9d02564fe11efbc6b
 SHA1 (patch-configure) = d9cd7509ffa682104703b3aa626a4cd5751ebdfe

Index: pkgsrc/security/libgcrypt/patches/patch-cipher_aria.c
diff -u pkgsrc/security/libgcrypt/patches/patch-cipher_aria.c:1.1 pkgsrc/security/libgcrypt/patches/patch-cipher_aria.c:1.1.12.1
--- pkgsrc/security/libgcrypt/patches/patch-cipher_aria.c:1.1   Fri Aug  9 03:51:27 2024
+++ pkgsrc/security/libgcrypt/patches/patch-cipher_aria.c       Tue Jan 13 00:53:26 2026
@@ -1,14 +1,16 @@
-$NetBSD: patch-cipher_aria.c,v 1.1 2024/08/09 03:51:27 ryoon Exp $
+$NetBSD: patch-cipher_aria.c,v 1.1.12.1 2026/01/13 00:53:26 maya Exp $
 
 * Do not conflict with NetBSD's bswap(3).
 
---- cipher/aria.c.orig 2024-08-02 04:47:06.896383457 +0000
+--- cipher/aria.c.orig 2024-03-28 10:07:27.000000000 +0000
 +++ cipher/aria.c
-@@ -641,11 +641,13 @@ u32 rotr32(u32 v, u32 r)
+@@ -641,11 +641,15 @@ u32 rotr32(u32 v, u32 r)
    return ror(v, r);
  }
  
-+#if !defined(__NetBSD__)
++#ifdef __NetBSD__
++#include <sys/bswap.h>
++#else
  static ALWAYS_INLINE
  u32 bswap32(u32 v)
  {