From nobody Thu Jan 16 13:18:51 2025 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 4YYk2z5pgfz5kR2g; Thu, 16 Jan 2025 13:18:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYk2z54KCz4589; Thu, 16 Jan 2025 13:18:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737033531; 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=hHtzW68+XUNedDHDs+h7uvEp7yn0ur9gT/F1pHu0i0o=; b=uZVsV2ZDJXD1xaBtDoaeTujrOYapjIKOOsojTq571gP116MjS0i1Qv+s5ua1JefG/qu03w IK1J7rxqlmwsZ/ZorXlyVy00mygA6ja+iPxrvWJFyZB2YNRQhHd1wGBBRnPXUnA9lzcesV uSPg4ZGAikaStMl12QFLoRprN3Twsd6nelbZZXjsKTIbbAzPVw3o2ss863CQWxLSrFKiAi jc9sGPe7Izm+rbICBr8GptE2K+yIB+4y34ffON6VlvB2HmdFTZvAvx5SAaQPFbJJyUuxQD mgAdYMUrmFiEeOB3zlr8kziXXiw0rEgVSfc5nDgKg8OofeWd6dpoZp35dapT+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737033531; 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=hHtzW68+XUNedDHDs+h7uvEp7yn0ur9gT/F1pHu0i0o=; b=TupuqNVJZU5+d/SZ+5WMF1yq0DtLGbjqqXgruOPt1iSg68XXjqz4XlamTBKtRZaCzNf8En QQs+TO/794H2+QDpYyhsH2bjwMs91qz+fkmJaHRT95WrD4tjNDkoWBDaFml6EGp21Uq3f+ 0a2pKjclExs0CO/VghI3C8RxWEVd4o2rMAGu+rkuAE034i0aT8TmSdIm5Z6nCk/MX98m+D e6e6JuByfXYJlkLdb+NarXoexTL+veLuaJdzGNMcSEd+N3FRsa+c4Lb+q8FHADEaoDJSGV jj7JtFPUwYHyrWf2jcFhNbTaQpg8jAifISN/bJuMLrJEQ86dB+RuItB7zMojIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737033531; a=rsa-sha256; cv=none; b=SI8DxxvK/Wyi5ML1GiAt1V9gZ/0fOXMXHCAzpiHfNE74b77AaV7WYYPvevGas19se2RxJY 3R/pFsclz99mn+TJ9Y6oD5D82pJWd14H7ivHbb8vlwRoW9P/p+2QrHWFmVOBKyXSxlj2/Q ijrrSqU80FO0f6jSC2qHyx9MkHz/XrpNVjSusC6aaNlWBA/c885CHbytquqn66I6D1McEG ZBYh6i7fWOfr2Ev4wwsCyGN+Dxh188vDd6GGvbZnEIoRKO/KgPqeJWzT+t8+fKCPOvV+Fp 87NSCrQrVyz3KnjIJJoJuNJAV6e++NOBaZFyZAEvZzZAJwFjBTLRJdnVwyElNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YYk2z44w1zZH8; Thu, 16 Jan 2025 13:18:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50GDIp1J045944; Thu, 16 Jan 2025 13:18:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GDIp1i045941; Thu, 16 Jan 2025 13:18:51 GMT (envelope-from git) Date: Thu, 16 Jan 2025 13:18:51 GMT Message-Id: <202501161318.50GDIp1i045941@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: 22f6c414960d - main - ports-mgmt/portupgrade: stop warning about wrong package format 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 22f6c414960d8b0191f39bf0a98bd43f482ac637 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=22f6c414960d8b0191f39bf0a98bd43f482ac637 commit 22f6c414960d8b0191f39bf0a98bd43f482ac637 Author: Baptiste Daroussin AuthorDate: 2025-01-16 13:14:29 +0000 Commit: Baptiste Daroussin CommitDate: 2025-01-16 13:18:49 +0000 ports-mgmt/portupgrade: stop warning about wrong package format pkg expect the compression format to be set via -f option, portupgrade passes this information extracting the PKG_SUFX variable which is now invariable since pkg 1.17. the .pkg suffix is always used, but the -f option still expect the compression format to be defined in same form as before: .tar, .tbz, .tgz etc. Remove the call to the -f format to remove a useless warning. PR: 284054 Submitted by: Terry Kennedy --- ports-mgmt/portupgrade/Makefile | 2 +- .../portupgrade/files/patch-pkg-compression-format | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 284b9f651f69..15712420b9df 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -1,6 +1,6 @@ PORTNAME= portupgrade PORTVERSION= 2.4.16 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ diff --git a/ports-mgmt/portupgrade/files/patch-pkg-compression-format b/ports-mgmt/portupgrade/files/patch-pkg-compression-format new file mode 100644 index 000000000000..982d92160dab --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-pkg-compression-format @@ -0,0 +1,20 @@ +--- bin/portupgrade 2025-01-15 11:54:51.384343000 -0500 ++++ bin/portupgrade 2025-01-15 12:07:01.082999000 -0500 +@@ -1077,7 +1077,7 @@ + end + + if $pkgdb.with_pkgng? +- system!(PkgDB::command(:pkg), 'create', '-o', $packages_dir, '-f', $portsdb.pkg_sufx, pkgname) ++ system!(PkgDB::command(:pkg), 'create', '-o', $packages_dir, pkgname) + else + system!(PkgDB::command(:pkg_create), '-vb', pkgname, + File.join($packages_dir, pkgname + $portsdb.pkg_sufx)) +@@ -2084,7 +2084,7 @@ + + if $pkgdb.with_pkgng? + backup_pkgfile = File.join($tmpdir, pkgname + $portsdb.pkg_sufx) +- backquote!(PkgDB::command(:pkg), 'create', '-o', $tmpdir, '-f', $portsdb.pkg_sufx, pkgname) ++ backquote!(PkgDB::command(:pkg), 'create', '-o', $tmpdir, pkgname) + else + if str = backquote!(PkgDB::command(:pkg_create), '-vb', pkgname, + File.join($tmpdir, pkgname + $portsdb.pkg_sufx))