git: 00a36881807c - main - net/cloud-init,-devel: use corrected path for /home dirs from 14.0-RELEASE

The branch main has been updated by dch:

URL: https://cgit.FreeBSD.org/ports/commit/?id=00a36881807c8aed5a6903d67d1d86be7705468a

commit 00a36881807c8aed5a6903d67d1d86be7705468a
Author:     Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2024-11-06 09:29:19 +0000
Commit:     Dave Cottlehuber <dch@FreeBSD.org>
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 <bsd.port.options.mk>
+
+.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.<iface_name>
+     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 <bsd.port.options.mk>
+
+.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.<iface_name>
+     dhclient_lease_directory = "/var/db"