From nobody Thu Nov 07 10:22:00 2024 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 4XkdRD1kS5z5cgHV; Thu, 07 Nov 2024 10:22:00 +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 4XkdRD1J66z4MGQ; Thu, 7 Nov 2024 10:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730974920; 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=3VFo/w6CGYQXl5nfMo2F5zlmRRefQtRCt9pTs+RhNzU=; b=iTGEEI9sw4EwzVwNCB0dIyxA94fgNpwuze4Nibk9pzFNdv9w9V3zUfQMi9IoYJNGc8NC5J mGnBZWgEuA03pVcxveO3xvuKOEv8TeV/s9cUgzZUC1h9Mk7EeiRWQEuvE8vmbDiABdVXqZ dIrnZkSEYafUGIwXXNHriZ11D96e7NW9UhHxesLNPc4aWEDAHrx/wVPo1Z/sLqM5KBZsFY p7W/HeTWZXoNOdtzFqtBjHIeXwvVVXgNH62gquq+bJvUocNjw9vEwTt6O+IjrTLPvqPggo cQz7iWkb5S7mGVelupxFyuZipVPWHyurPIRvPUdzdwH0/Qyn59Tk5eNBxYAucg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730974920; 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=3VFo/w6CGYQXl5nfMo2F5zlmRRefQtRCt9pTs+RhNzU=; b=Forkt0VD/+PxDmWtcMvBAw5db2U1Rxi8vC0111rz47JARFlrjTDmnIUXzzjZpeydc511mq ZJmzK3FnVfEsVH8hAL5sq0+HkHjKbrlgBuo7KjAu81b1M35sC0/+tJbEEeaiI5ht4UQRGC bMSvJir2hM1khRh1YYApJX+s147murZ3FuMIHz+fvhH4J3B+tpSKfmqFAWJRVTS2WDy62u VoLyQ5Gzm64xtBtTt54LM9NDuSAr4P/Dq5Lo/uWaMbQ2rWbi/vBDdoiWFvjYJvklagrNaC lyuaflMDcOWWyxEkAIqG3aIVEzIIsoHdEHt1TRSrgMBD6fd1s1AqodT0UdKqWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730974920; a=rsa-sha256; cv=none; b=OLTVZa0pVkg6MhJTRw/bPg8BKD0L5qtU9VFna5eVXQIbDuF7zvekyq75Ca97VBiuvL6ppa 2sNS44S2JGYqbTdo9eyrGVypGE4xH+4ikvLBZT2Oao9PCNkSuK+dym0yOqM/TrEGm5hdUr Vyc3d9NqSndtM5Clpfc4dM8JXNLsC1FB6eT035ycVQVOk9KYq6ZFYMayjNqvI7kW2diKJA IsvRwznd76Ra1hwvZp7TdI6Tq433fs04G8TDHAheRPuzz97U/PJeVs3i3TKvLLcpgR6+tn P0YhK2wwJZbjxB5m4rsMMfYLxUwkUYelnqM4JSF+lCTb4AuixKvIcT1g/Crwhg== 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 4XkdRD0pkNzhxq; Thu, 7 Nov 2024 10:22:00 +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 4A7AM0YI083314; Thu, 7 Nov 2024 10:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7AM07F083310; Thu, 7 Nov 2024 10:22:00 GMT (envelope-from git) Date: Thu, 7 Nov 2024 10:22:00 GMT Message-Id: <202411071022.4A7AM07F083310@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 00a36881807c - main - net/cloud-init,-devel: use corrected path for /home dirs from 14.0-RELEASE 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 00a36881807c8aed5a6903d67d1d86be7705468a Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=00a36881807c8aed5a6903d67d1d86be7705468a commit 00a36881807c8aed5a6903d67d1d86be7705468a Author: Dave Cottlehuber AuthorDate: 2024-11-06 09:29:19 +0000 Commit: Dave Cottlehuber CommitDate: 2024-11-07 10:21:41 +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 --- 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"