From nobody Thu Jun 29 14:14:04 2023 X-Original-To: dev-commits-ports-main@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 4QsL6P22Qnz4ktLQ; Thu, 29 Jun 2023 14:14:05 +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 4QsL6P1N3Dz3PjT; Thu, 29 Jun 2023 14:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688048045; 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=nRiZ0ZNP37HXRjfARm07DTFoKAFK702RGZGZNUZEhfA=; b=IRsJcJNBxt2KfB713FIJ5I4W0lM8gUpcpSatEDBe0cbTYXI6CjaUAk6qUpg9S9IWoUXTHF MNfZLU/QoDoaVO53OQW2M7EXf8SigT/K0Hw0NpeBgwR5blDhrlJiNLklvShRAimCDlDCd2 4h2sPy2SKQXfS2hlVAM9fZvTSWkw/IbT+6A+ji/ZrcyFHx5YzfGMJH1ILipKO0dgafIE5m fBJUEbRvuVz4xCyt99rmYxxEuSdR+RZlsRHpuDmyTw61K6hQt3XT/9liKpUMiiK4xfsc7U NA38MNX3TR430WObbGwgFurpxImpsz2Q0TbhXB9jB6+4JTYaa3SQArheXgNskg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688048045; 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=nRiZ0ZNP37HXRjfARm07DTFoKAFK702RGZGZNUZEhfA=; b=Jc9rleo9gz5TjD0jugUsxbFdqlWTbxQa+IEdtWDb4hADZfgHwIUeBPdj+0muJiIslmVmz7 VaybBrIZiMLexu2sDC4Ln4PtKzIptDq3C+id5WTjQkibCSrr/rzCdAj/7nUDsU2vuD0Cc0 UXCPYQZmhp2GRddQJcsMGqPvX4NA5oqNxjxAHMTqLn6afS5Y435OOjAj97VPwSf1ybChWg xgxBhiqeMvSXobw4jvL0qr1dhKiLEVUwsb5TU1FkVy0GBPZ6AgLQSDp/fHTsxQ4xO0xdOV ieGuXeUpFfrmXGc02wP1WdDo5+n2uTbHY6s6g8ts7TVNpXKgcMLwxI9lQTZ+pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688048045; a=rsa-sha256; cv=none; b=IsFLiRSxMs2zLHrgQw82EGGNa8SNPWgkvufTIrCjX7SvIsZp+N2mrVRFGYIFznohXA0E9W a9XfOS9/57tqQtKsdBi3MYErpc/7dPe+L/3qzCDblU6aSsL+Nv4X3Wa7zNA0NQo3yCpGbJ nwHUZBoXYEVUQWdGyeiG8qvOIiSc3DhCNsZA1oo1A+B2RexpYIK/8mfEaHhXUIX35eR1nv qF0Ed+o+5CYCuGPPE0nYjVvcbgoNm2IA1qiqsLU/RrEHSUtl+2CwvsFFFC3R8pICVoJYJm 7esDzC0lZW8uEhRaaTqiqatBdzmOLi2//gCjdz3ikmNO3J7WgnH+dFVySXRGfQ== 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 4QsL6P0FC1zJQF; Thu, 29 Jun 2023 14:14:05 +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 35TEE4Qa070563; Thu, 29 Jun 2023 14:14:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35TEE4Kc070562; Thu, 29 Jun 2023 14:14:04 GMT (envelope-from git) Date: Thu, 29 Jun 2023 14:14:04 GMT Message-Id: <202306291414.35TEE4Kc070562@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: 6bef385a56d7 - main - ports-mgmt/pkg: update to 1.19.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 6bef385a56d7e3b907de7c38f051f05efb45996a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=6bef385a56d7e3b907de7c38f051f05efb45996a commit 6bef385a56d7e3b907de7c38f051f05efb45996a Author: Baptiste Daroussin AuthorDate: 2023-06-29 14:08:22 +0000 Commit: Baptiste Daroussin CommitDate: 2023-06-29 14:08:22 +0000 ports-mgmt/pkg: update to 1.19.2 This release only deals with RSA signature for people using the PUBKEY mechanism. With openssl3 the signature had to change, in this release we make pkg accept both the new signatures and the old ones. if built with openssl 1 (aka freebsd 12 and 13) pkg will continue issueing the usual signatures aka no changes. if built with openssl 3 (aka freebsd 14) pkg will issue a new format of signature. The version of pkg older than 1.19.2 will not be able to use a signature issued witg pkg running on freebsd 14 All system running 1.19.2 and above will be able to accept any of the signatures. If a user get stuck, for any reason, pkg bootstrap -f will fix the situation as long as it installs 1.19.2 and above. Note that is only concens PUBKEY which is not the default. No changes at all for users of the official FreeBSD repositories. --- ports-mgmt/pkg/Makefile | 3 +-- ports-mgmt/pkg/distinfo | 6 +++--- ports-mgmt/pkg/files/patch-auto.def | 11 ----------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 9dd8690d94c6..d0ea07f75bf4 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,6 +1,5 @@ PORTNAME= pkg -DISTVERSION= 1.19.1 -PORTREVISION= 3 +DISTVERSION= 1.19.2 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index b55506b30d82..8b7f3a15c636 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675345444 -SHA256 (freebsd-pkg-1.19.1_GH0.tar.gz) = 6cf51347635bc81e45bc093ce2580fc87f207e234587b9d85a5b63e0fb4970dc -SIZE (freebsd-pkg-1.19.1_GH0.tar.gz) = 4091916 +TIMESTAMP = 1688046061 +SHA256 (freebsd-pkg-1.19.2_GH0.tar.gz) = 4838c6bee5cab64dc8376d75e5dc8086130928dca0d5ac6e3648c701942cd006 +SIZE (freebsd-pkg-1.19.2_GH0.tar.gz) = 4092059 diff --git a/ports-mgmt/pkg/files/patch-auto.def b/ports-mgmt/pkg/files/patch-auto.def deleted file mode 100644 index f6e9bdb88b96..000000000000 --- a/ports-mgmt/pkg/files/patch-auto.def +++ /dev/null @@ -1,11 +0,0 @@ ---- auto.def.orig 2023-02-01 15:55:57 UTC -+++ auto.def -@@ -5,7 +5,7 @@ set med_ver 19 - - set maj_ver 1 - set med_ver 19 --set min_ver 0 -+set min_ver 1 - set dev_ver 0 - define PKG_API [expr $maj_ver * 1000000 + $med_ver * 1000 + $min_ver] - define VERSION $maj_ver.$med_ver.$min_ver[expr {$dev_ver ? ".$dev_ver" : ""}]