From nobody Mon Jul 10 12:17:08 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R030P0z3qzZT6l; Mon, 10 Jul 2023 12:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R030P0GTnz3vdv; Mon, 10 Jul 2023 12:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688991429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCP7hxNr23ALZ/i0E0nzaSZIxR4yUSByFFkLhAhmy2Y=; b=rbWDm223iJY1R5PoYBVIFxR0cSd6zlFGjUKC+qhBR5IO0k/n0fCTE5SbgMwGitQ89Wjbnf OPYX27To+pGG7MOcFPmEMpuExTqcwYf3VoYhQkKsNbItOqvg/lgkrnJrn8FNsPNI8eBfUq ikToDNVtt6rUoWB87WFIhr3LGAPj3xUosrio5olSQFF2cqWplFNCXIo77kItmeTn7ozngB eLxV4njNCUgyinh8U/By/9Tmdkq63DKuoqGDRG5eTSVZ9sujOkQL7+eSDyOMdok1wtORXp XfCoGhxxAJ5fh6Qp1S2hS0d4BjbIggY2DgYSD+BNwBNj7ZLhEqGdmGKejva2gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688991429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCP7hxNr23ALZ/i0E0nzaSZIxR4yUSByFFkLhAhmy2Y=; b=Lr5AW+5sXMFlDqZU34ZpSaSb7lAiTc1JQ33oIwpqutZHHBvI1GZ3OrmE/IEokM5xwX0+wK ODAvBv7ItTTwylgEyCw7zewlPdDuL9nVLlRDMFObEsbLkvSa5b23j+QfAklC7KcQu1Odxr BA57mKCgPYnu0Jyco9+YmohbbIgJ6MjMOVt8TQZ/+qgUOBoU3Yb1ibdLvtdf4PqSKQ3ek5 IxE5ZIoJukcY7K4c2LwBbdxOc9lHIW+7b+MHo8xbbEaG9o3+skQIodfIUZJEpGvWaVOd78 nvVroVevnTOu1rqmLRaLbh8zGxSVGfT2kZlddYJNM8epzPnRpkC5UOpEgNjcJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688991429; a=rsa-sha256; cv=none; b=Ka4/yEiu0+zmf1RuA/BhFL0nJWz8Ep+QMLq+9ItvJKWFfX3S0cpSRxYtJatVOHyj78meY3 brSGrtmxU9bZTuDNs9EiOzzH36l/gdPExas+R8e+dw6daGlFZoihDdfYE1EbP0+Ql5IFT3 zToSUIqJBufN3g37VpTNTnxgC1IHLoRu6Xr0fkNFQqNCBJHkXIgTQ+xNbzV8NAUtaIR1Vb PdjZLGUJ0BF3acilIPi4RrwNZ3yAYhRQrNLx1eLx2qLeIv0P8KeeiVR9Mt15BT/2HBAlCP nwTvJVfOZhEOvyEKQu5egZZOYEMzMhO58Q0lTm54UOfPNCewXWBRaya6QSA5mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R030N6RdDzkY4; Mon, 10 Jul 2023 12:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36ACH8NZ041767; Mon, 10 Jul 2023 12:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36ACH8bb041766; Mon, 10 Jul 2023 12:17:08 GMT (envelope-from git) Date: Mon, 10 Jul 2023 12:17:08 GMT Message-Id: <202307101217.36ACH8bb041766@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 09a785875a27 - main - pkg*: fix regressions from 1.20 release List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09a785875a278fbcf023f6993f17a68b58ad6236 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=09a785875a278fbcf023f6993f17a68b58ad6236 commit 09a785875a278fbcf023f6993f17a68b58ad6236 Author: Baptiste Daroussin AuthorDate: 2023-07-10 12:15:28 +0000 Commit: Baptiste Daroussin 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 repopath = xstrdup(g.gl_pathv[i]); - tll_push_back(localpkgs, p);