From nobody Thu Nov 07 10:27:13 2024 X-Original-To: dev-commits-ports-branches@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 4XkdYG0pbgz5cgqb; Thu, 07 Nov 2024 10:27:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkdYF65PPz4Mc1; Thu, 7 Nov 2024 10:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730975233; 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=1l4GJqFLfoRrYge1mkbnjqAAYrHD76cWCGgrta6u9Js=; b=lsv7iCeUmXloyi6B0DmTntAhfY1yt7ivo8r95trJ3hAZPfk2+goT3gA0xYCxaWFPCfpbkW mrwqxtN0bSpbmRgyASklNbjl0CH8LR0Cl1nmNuhsytozmFmQ7HALp/Hy0vnw8HKLdoZczH LA48AeY6N1KeEdMj78KRopEqZ80C7IEwCyIyG8pqVI+nRMOStza/GFBPmxgaX4pxLtaG8L qk7uduEA5afz/8keD/8Zc2YdBEv8gAxinTVWxbhQWVSqrdjViLqpRqNdTZi2sWZEp+7DiM O/7w/3Ggf96L21UNgHkykdShIXSjhSXrKuVyx7U/uYC+So+sunPiAWdQmvDFqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730975233; 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=1l4GJqFLfoRrYge1mkbnjqAAYrHD76cWCGgrta6u9Js=; b=RAtbKkJsTrQYkk/bNUvINTI12fieOiKTArvZHmWbN1BPPshLX9A3Pds3isR7xQeuQmTHnu YHmv0L4ON855+MAt9ZQdvHoguab83DDMxGA8jih87IaBh+SPalPEvaxEeSyAtar/ZR4WDc LpwE8YfLQrjvmO0I6dMX6/aa9/6zfM/iGH6Hnc7o6fhCmFE7cr17Tww7xM91Q/Q4IW80oe l6vUS3RUzcNfYrCzV/APXeiiM5AOHEo50dYWssh8tnA3jHS+BjqLZfZibPhH1xGknujWyf wgp6JXWdTtArUjMkO+jtF/9O8bh4nCpBhvVy62gPt+rXt42d2FyjkrFFH9QjGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730975233; a=rsa-sha256; cv=none; b=rviVoFufn/XyG7pWBJCVY28KFyTFyDIyKWVPnLm7RmD5rVLXfQVz+kco43niOJdm0Lnfe5 QOSJoZ8XR6ka5y7BUPuxodaCLm1E3iiT3q7fAoOZlSWU/TwzJJhECtHquJMKaAx2J746BJ sfuJhVY6v0ixj+kWwUugxuvjVV/lkwkuw/+wwOVcO3qZLFSmy2OKXJ1A0Q7DPjEUW8SJmk M7q5cV5vtVJH7ScS1oKEeWza7ArAWvgX2H9+8+Nzsohfopt/GoDF+9zhkEVHX6FRXV/88Y l7kEWvjDctbpE35Xs0gzBsn1OfPeMJ8eIxYvlg3C+bSzqxyazufxwcYqhwNiBw== 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 4XkdYF5ZqrzhDy; Thu, 7 Nov 2024 10:27:13 +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 4A7ARD87085056; Thu, 7 Nov 2024 10:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7ARDAs085053; Thu, 7 Nov 2024 10:27:13 GMT (envelope-from git) Date: Thu, 7 Nov 2024 10:27:13 GMT Message-Id: <202411071027.4A7ARDAs085053@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: 882da7772410 - 2024Q4 - net/cloud-init,-devel: use corrected path for /home dirs from 14.0-RELEASE List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 882da7772410c73f0e755a29e1381dde479ef097 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=882da7772410c73f0e755a29e1381dde479ef097 commit 882da7772410c73f0e755a29e1381dde479ef097 Author: Dave Cottlehuber AuthorDate: 2024-11-06 09:29:19 +0000 Commit: Dave Cottlehuber CommitDate: 2024-11-07 10:27:02 +0000 net/cloud-init,-devel: use corrected path for /home dirs from 14.0-RELEASE the softlinked home -> /usr/home has been removed in FreeBSD 14.0-RELEASE and upwards, as the mountpoints are now /home. Sponsored by: SkunkWerks, GmbH Approved by: maintainer Differential Revision: https://reviews.freebsd.org/D47338 Upstream Issue: https://github.com/canonical/cloud-init/issues/5850 (cherry picked from commit 00a36881807c8aed5a6903d67d1d86be7705468a) --- net/cloud-init-devel/Makefile | 8 +++++++- net/cloud-init-devel/files/extra-cloudinit_distros_freebsd.py | 11 +++++++++++ net/cloud-init/Makefile | 8 +++++++- net/cloud-init/files/extra-cloudinit_distros_freebsd.py | 11 +++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/net/cloud-init-devel/Makefile b/net/cloud-init-devel/Makefile index 9eaa99fae502..35385f02f3a1 100644 --- a/net/cloud-init-devel/Makefile +++ b/net/cloud-init-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= cloud-init DISTVERSION= 23.4-319 DISTVERSIONSUFFIX= -gec384da45 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -devel @@ -51,6 +51,12 @@ CONFLICTS_INSTALL= cloud-init # Standard bsd.port.mk variables ETCDIR= ${PREFIX}/etc/cloud +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1400000 +EXTRA_PATCHES= ${PATCHDIR}/extra-cloudinit_distros_freebsd.py +.endif + NO_ARCH= yes post-patch: diff --git a/net/cloud-init-devel/files/extra-cloudinit_distros_freebsd.py b/net/cloud-init-devel/files/extra-cloudinit_distros_freebsd.py new file mode 100644 index 000000000000..e63cedbcbbbc --- /dev/null +++ b/net/cloud-init-devel/files/extra-cloudinit_distros_freebsd.py @@ -0,0 +1,11 @@ +--- cloudinit/distros/freebsd.py.orig 2024-10-30 12:25:07 UTC ++++ cloudinit/distros/freebsd.py +@@ -35,7 +35,7 @@ class Distro(cloudinit.distros.bsd.BSD): + pkg_cmd_update_prefix = ["pkg", "update"] + pkg_cmd_upgrade_prefix = ["pkg", "upgrade"] + prefer_fqdn = True # See rc.conf(5) in FreeBSD +- home_dir = "/usr/home" ++ home_dir = "/home" + # FreeBSD has the following dhclient lease path: + # /var/db/dhclient.leases. + dhclient_lease_directory = "/var/db" diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile index 5a80ee776479..5d65d66a9638 100644 --- a/net/cloud-init/Makefile +++ b/net/cloud-init/Makefile @@ -1,6 +1,6 @@ PORTNAME= cloud-init DISTVERSION= 24.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -41,6 +41,12 @@ CONFLICTS_INSTALL= cloud-init-devel # Standard bsd.port.mk variables ETCDIR= ${PREFIX}/etc/cloud +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 +EXTRA_PATCHES= ${PATCHDIR}/extra-cloudinit_distros_freebsd.py +.endif + NO_ARCH= yes post-patch: diff --git a/net/cloud-init/files/extra-cloudinit_distros_freebsd.py b/net/cloud-init/files/extra-cloudinit_distros_freebsd.py new file mode 100644 index 000000000000..eb4d375a49fd --- /dev/null +++ b/net/cloud-init/files/extra-cloudinit_distros_freebsd.py @@ -0,0 +1,11 @@ +--- cloudinit/distros/freebsd.py.orig 2024-10-25 15:58:28 UTC ++++ cloudinit/distros/freebsd.py +@@ -35,7 +35,7 @@ class Distro(cloudinit.distros.bsd.BSD): + pkg_cmd_update_prefix = ["pkg", "update"] + pkg_cmd_upgrade_prefix = ["pkg", "upgrade"] + prefer_fqdn = True # See rc.conf(5) in FreeBSD +- home_dir = "/usr/home" ++ home_dir = "/home" + # FreeBSD has the following dhclient lease path: + # /var/db/dhclient.leases. + dhclient_lease_directory = "/var/db"