From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44288158B20 for ; Sun, 02 Feb 2025 08:19:39 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 282D0343006 for ; Sun, 02 Feb 2025 08:19:39 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1BC191103B6; Sun, 02 Feb 2025 08:19:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 0FDC01103B6 for ; Sun, 02 Feb 2025 08:19:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB37C343006 for ; Sun, 02 Feb 2025 08:19:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EFD518F6 for ; Sun, 02 Feb 2025 08:19:36 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1738484312.0b4f73b2089b8582a12cc384173049454cfbe2aa.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/incus/, app-containers/incus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch app-containers/incus/incus-6.9-r1.ebuild app-containers/incus/incus-6.9.ebuild X-VCS-Directories: app-containers/incus/ app-containers/incus/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 0b4f73b2089b8582a12cc384173049454cfbe2aa X-VCS-Branch: master Date: Sun, 02 Feb 2025 08:19:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 14f1bf57-9a09-4401-a0c8-e0117f8a222b X-Archives-Hash: dcaa341e1ce10a3aca38b41c3274fe02 commit: 0b4f73b2089b8582a12cc384173049454cfbe2aa Author: Joonas Niilola gentoo org> AuthorDate: Sun Feb 2 08:18:32 2025 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Feb 2 08:18:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4f73b2 app-containers/incus: add upstream patch to 6.9 for 'incus file pull' Signed-off-by: Joonas Niilola gentoo.org> ...cus-6.9-ensure-leading-slash-in-all-paths.patch | 32 ++++++++++++++++++++++ .../{incus-6.9.ebuild => incus-6.9-r1.ebuild} | 2 ++ 2 files changed, 34 insertions(+) diff --git a/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch b/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch new file mode 100644 index 000000000000..a4647528c593 --- /dev/null +++ b/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch @@ -0,0 +1,32 @@ +From b726905c66050ac4229d53ce079a0bd05dbe900d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Thu, 30 Jan 2025 15:21:36 +0100 +Subject: [PATCH] incus/file/pull: Ensure we have a leading / in all paths +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Closes #1614 + +Signed-off-by: Stéphane Graber +--- + cmd/incus/file.go | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmd/incus/file.go b/cmd/incus/file.go +index a17486ad327..99467a0bfc5 100644 +--- a/cmd/incus/file.go ++++ b/cmd/incus/file.go +@@ -575,6 +575,11 @@ func (c *cmdFilePull) Run(cmd *cobra.Command, args []string) error { + return fmt.Errorf(i18n.G("Invalid source %s"), resource.name) + } + ++ // Make sure we have a leading / for the path. ++ if !strings.HasPrefix(pathSpec[1], "/") { ++ pathSpec[1] = "/" + pathSpec[1] ++ } ++ + sftpConn, ok := sftpClients[pathSpec[0]] + if !ok { + sftpConn, err = resource.server.GetInstanceFileSFTP(pathSpec[0]) + diff --git a/app-containers/incus/incus-6.9.ebuild b/app-containers/incus/incus-6.9-r1.ebuild similarity index 98% rename from app-containers/incus/incus-6.9.ebuild rename to app-containers/incus/incus-6.9-r1.ebuild index fa843c98a152..2554cf605f8b 100644 --- a/app-containers/incus/incus-6.9.ebuild +++ b/app-containers/incus/incus-6.9-r1.ebuild @@ -91,6 +91,8 @@ RESTRICT="test" GOPATH="${S}/_dist" +PATCHES=( "${FILESDIR}"/incus-6.9-ensure-leading-slash-in-all-paths.patch ) + src_unpack() { verify-sig_src_unpack go-module_src_unpack