From owner-dev-commits-ports-all@freebsd.org Wed Jul 21 12:23:13 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5531C6630BA; Wed, 21 Jul 2021 12:23:13 +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 4GVF9F1pXTz4Qml; Wed, 21 Jul 2021 12:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2468C1E1A4; Wed, 21 Jul 2021 12:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16LCNDHT070493; Wed, 21 Jul 2021 12:23:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16LCNDjf070492; Wed, 21 Jul 2021 12:23:13 GMT (envelope-from git) Date: Wed, 21 Jul 2021 12:23:13 GMT Message-Id: <202107211223.16LCNDjf070492@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: ec2764d5ec49 - main - Mk/bsd.port.mk: prepare the land for pkg 1.17 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: ec2764d5ec4933f52cb0718663f60f1e1b1eed7f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2021 12:23:13 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec2764d5ec4933f52cb0718663f60f1e1b1eed7f commit ec2764d5ec4933f52cb0718663f60f1e1b1eed7f Author: Baptiste Daroussin AuthorDate: 2021-07-21 12:19:56 +0000 Commit: Baptiste Daroussin CommitDate: 2021-07-21 12:23:04 +0000 Mk/bsd.port.mk: prepare the land for pkg 1.17 in next version of pkg, we now use a uniq extension: '.pkg' whatever the compression is, the problem is some bootstrap pkg(7) does not handle that yet, notably on freebsd 11.4 and 12.2. We already have a compatibility layer by creating a symlink on the old extension, which works but the signature itself will not exist with the old extension. Add a workaround in the ports tree to symlink the new signature to the old expected signature. Given at the moment we are doing that things are not yet signed by default we do create a dead symlink, but at the moment the repo are published the right signature will be there. --- Mk/bsd.port.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 0fe16fa5426d..228644a1845f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2648,6 +2648,9 @@ PKGBASE?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX} .if ${WITH_PKG} == devel PKGOLDLATESTFILE= ${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_OLDSUFX} +# Temporary workaround to be deleted once every supported version of FreeBSD +# have a bootstrap which handles the pkg extension. +PKGOLDSIGFILE= ${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_OLDSUFX}.sig .endif CONFIGURE_SCRIPT?= configure @@ -3447,10 +3450,16 @@ ${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY} ${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE} .if ${WITH_PKG} == devel -_EXTRA_PACKAGE_TARGET_DEP+= ${PKGOLDLATESTFILE} +_EXTRA_PACKAGE_TARGET_DEP+= ${PKGOLDLATESTFILE} ${PKGOLDSIGFILE} ${PKGOLDLATESTFILE}: ${PKGOLDFILE} ${PKGLATESTREPOSITORY} ${INSTALL} -l rs ${PKGOLDFILE} ${PKGOLDLATESTFILE} + +# Temporary workaround to be deleted once every supported version of FreeBSD +# have a bootstrap which handles the pkg extension. + +${PKGOLDSIGFILE}: ${PKGLATESTREPOSITORY} + ${INSTALL} -l rs pkg.pkg.sig ${PKGOLDSIGFILE} .endif . endif