git: 09a785875a27 - main - pkg*: fix regressions from 1.20 release

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09a785875a278fbcf023f6993f17a68b58ad6236

commit 09a785875a278fbcf023f6993f17a68b58ad6236
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2023-07-10 12:15:28 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2023-07-10 12:15:28 +0000

    pkg*: fix regressions from 1.20 release
    
    - reduce memory usage for pkg add
    - fix regression in url parsing for ssh
    - fix some more compatibility with libfetch
    - update pkg-triggers manpage
---
 ports-mgmt/pkg-devel/Makefile                |  4 ++--
 ports-mgmt/pkg-devel/distinfo                |  6 +++---
 ports-mgmt/pkg/Makefile                      |  3 +--
 ports-mgmt/pkg/distinfo                      |  6 +++---
 ports-mgmt/pkg/files/patch-add-reduce-memory | 13 -------------
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index d996dd3f8b78..0fc71641375d 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pkg
-DISTVERSION=	1.20.99.1
+DISTVERSION=	1.20.99.2
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 PKGNAMESUFFIX=	-devel
@@ -12,7 +12,7 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	7ceb2494
+GH_TAGNAME=	67b61a85
 
 CFLAGS+=	-O0 -g -Wno-error
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index 12eca77fada6..69c701c23fcf 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688630373
-SHA256 (freebsd-pkg-1.20.99.1-7ceb2494_GH0.tar.gz) = 5017859079cd017ff313f04210d7235e0f3705bd8af2e2f8eace40238f1f8dee
-SIZE (freebsd-pkg-1.20.99.1-7ceb2494_GH0.tar.gz) = 8242692
+TIMESTAMP = 1688991180
+SHA256 (freebsd-pkg-1.20.99.2-67b61a85_GH0.tar.gz) = c4d982ad4609210f63882425cea1753bb3c4e3f3bdd5da38aaff3e8f83d851e1
+SIZE (freebsd-pkg-1.20.99.2-67b61a85_GH0.tar.gz) = 8242789
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index d7e0df3d62a6..0ce6a6b94ac7 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pkg
-DISTVERSION=	1.20.1
-PORTREVISION=	1
+DISTVERSION=	1.20.2
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index f51b8eea82cf..ce04438858eb 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688630335
-SHA256 (freebsd-pkg-1.20.1_GH0.tar.gz) = b8b245f41640ffefe7d45d3cc3f8d5642427e969ab9594e3de8281637e6ca890
-SIZE (freebsd-pkg-1.20.1_GH0.tar.gz) = 8242190
+TIMESTAMP = 1688991315
+SHA256 (freebsd-pkg-1.20.2_GH0.tar.gz) = 9b2db7ea6be375bafde8be35930440d681f2846028ff2384d766dc9b48a1f80e
+SIZE (freebsd-pkg-1.20.2_GH0.tar.gz) = 8242398
diff --git a/ports-mgmt/pkg/files/patch-add-reduce-memory b/ports-mgmt/pkg/files/patch-add-reduce-memory
deleted file mode 100644
index a88f29ec9dc5..000000000000
--- a/ports-mgmt/pkg/files/patch-add-reduce-memory
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git libpkg/pkg_add.c libpkg/pkg_add.c
-index bac5d949..3512bd66 100644
---- libpkg/pkg_add.c
-+++ libpkg/pkg_add.c
-@@ -1047,7 +1047,7 @@ pkg_add_check_pkg_archive(struct pkgdb *db, struct pkg *pkg,
- 			for (int i = 0; i <g.gl_pathc; i++) {
- 				struct pkg *p = NULL;
- 				if (pkg_open(&p, g.gl_pathv[i],
--				    PKG_OPEN_MANIFEST_ONLY) == EPKG_OK) {
-+				    PKG_OPEN_MANIFEST_COMPACT) == EPKG_OK) {
- 					if (should_append_pkg(&localpkgs, p)) {
- 						p->repopath = xstrdup(g.gl_pathv[i]);
- 						tll_push_back(localpkgs, p);