git: 05cdce2cc246 - main - security/gnupg25: Update 2.5.17 => 2.5.18

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Thu, 26 Mar 2026 09:53:32 UTC 
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=05cdce2cc2464415d23bbe2fd8ea79f5e5c6463a

commit 05cdce2cc2464415d23bbe2fd8ea79f5e5c6463a
Author:     Herbert J. Skuhra <herbert@gojira.at>
AuthorDate: 2026-03-26 09:52:05 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-03-26 09:52:05 +0000

    security/gnupg25: Update 2.5.17 => 2.5.18
    
    Changelog:
    https://dev.gnupg.org/T7999
    
    PR:             293469
    Approved by:    adridg (maintainer, timeout 1 month)
    Sponsored by:   UNIS Labs
---
 security/gnupg25/Makefile | 7 +++----
 security/gnupg25/distinfo | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/security/gnupg25/Makefile b/security/gnupg25/Makefile
index efcfa895898f..1d872bfe9172 100644
--- a/security/gnupg25/Makefile
+++ b/security/gnupg25/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gnupg
-DISTVERSION=	2.5.17
+DISTVERSION=	2.5.18
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	25
@@ -13,8 +13,6 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL3
 
-CONFLICTS_INSTALL=	gnupg1-* gnupg-2.4*
-
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
@@ -33,7 +31,8 @@ CONFIGURE_ARGS=	--disable-ntbtls
 TEST_ARGS=	TESTARGS=--parallel
 TEST_TARGET=	check
 
-CONFLICTS=	dirmngr
+CONFLICTS=		dirmngr
+CONFLICTS_INSTALL=	gnupg1-* gnupg-2.4*
 
 INFO=		gnupg
 
diff --git a/security/gnupg25/distinfo b/security/gnupg25/distinfo
index ad4774b96b27..ab6f105f9675 100644
--- a/security/gnupg25/distinfo
+++ b/security/gnupg25/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1769640668
-SHA256 (gnupg-2.5.17.tar.bz2) = 2c1fbe20e2958fd8fb53cf37d7c38e84a900edc0d561a1c4af4bc3a10888685d
-SIZE (gnupg-2.5.17.tar.bz2) = 8308629
+TIMESTAMP = 1772133523
+SHA256 (gnupg-2.5.18.tar.bz2) = 0dbd64e0322fe1a4813360d46539d5f8daf4a8fa235cf5fce464e8b0214a7e4f
+SIZE (gnupg-2.5.18.tar.bz2) = 8307830