git: 0a768dc03dec - main - sysutils/debootstrap: Fix dependency after gnupg update

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0a768dc03dec1e6f48ca14ba8ff51568a18c46f1

commit 0a768dc03dec1e6f48ca14ba8ff51568a18c46f1
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-06-27 13:39:27 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-06-27 13:52:44 +0000

    sysutils/debootstrap: Fix dependency after gnupg update
    
    Approved by:    portmgr (fixit blanket)
---
 sysutils/debootstrap/Makefile              |  3 ++-
 sysutils/debootstrap/files/patch-functions | 31 ------------------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile
index 4cfc1e70f708..157f2677a75c 100644
--- a/sysutils/debootstrap/Makefile
+++ b/sysutils/debootstrap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	debootstrap
 PORTVERSION=	1.0.143
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -13,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/debian/copyright
 
 RUN_DEPENDS=	${LOCALBASE}/share/keyrings/ubuntu-archive-keyring.gpg:security/ubuntu-keyring \
 		bash:shells/bash \
-		gpgv2:security/gnupg \
+		gpgv:security/gnupg \
 		gtar:archivers/gtar \
 		pcre2grep:devel/pcre2 \
 		wget:ftp/wget
diff --git a/sysutils/debootstrap/files/patch-functions b/sysutils/debootstrap/files/patch-functions
index a194fe580ddf..5ac4bd767ce7 100644
--- a/sysutils/debootstrap/files/patch-functions
+++ b/sysutils/debootstrap/files/patch-functions
@@ -1,27 +1,5 @@
 --- functions.orig	2026-03-26 22:58:30 UTC
 +++ functions
-@@ -700,10 +700,10 @@ download_release_sig () {
- 
- 		info RELEASESIG "Checking Release signature"
- 		# If everything is installed, prefer gpgv for now
--		if in_path gpgv; then
-+		if in_path gpgv2; then
- 			# Don't worry about the exit status from gpgv; parsing the output will
- 			# take care of that.
--			(gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
-+			(gpgv2 --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
- 			 "$relsigdest" "$reldest" || true) | read_gpg_status
- 		elif in_path sopv; then
- 			local rc=0
-@@ -715,7 +715,7 @@ download_release_sig () {
- 			check_sqv_status "$rc"
- 		else
- 			# This is already checked at argument parsing time, so shouldn't happen here
--			error 1 NEEDPGPV "none of sopv, sqv or gpgv are installed, but required for Release verification"
-+			error 1 NEEDPGPV "none of sopv, sqv or gpgv2 are installed, but required for Release verification"
- 		fi
- 		progress 100 100 DOWNRELSIG "Downloading Release file signature"
- 	fi
 @@ -1045,7 +1045,7 @@ extract_dpkg_deb_data () {
  extract_dpkg_deb_data () {
  	local pkg="$1"
@@ -74,12 +52,3 @@
  		elif [ "$1" = "STANZAS" ]; then
  			local pkgdest="$2"; shift; shift
  			perl -e '
-@@ -1941,7 +1941,7 @@ read_gpg_status () {
- 	elif [ "$unkkey" ]; then
- 		error 1 UNKNOWNRELSIG "Release signed by unknown key (key id %s)\n   The specified keyring $KEYRING may be incorrect or out of date.\n   You can find the latest Debian release key at https://ftp-master.debian.org/keys.html" "$unkkey"
- 	else
--		error 1 SIGCHECK "Error executing gpgv to check Release signature"
-+		error 1 SIGCHECK "Error executing gpgv2 to check Release signature"
- 	fi
- }
-