From nobody Wed Oct 5 16:28:04 2022 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 4MjKkD42Fkz4V8FX; Wed, 5 Oct 2022 16:28:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MjKkD39LNz3mZ9; Wed, 5 Oct 2022 16:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664987284; 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=twRbLkVzN6cunXMTOGBZybDgLr3RC/CN1t9Bg+KBh4c=; b=UQsHzU08vcu9WS7ggeBeOxMivaslWVKHj6HlDRYAuv+DpC5ZFGEn3JOzwUwIXIjYQ76ZE5 gXI4NL42YbZXv+TjAGNyLCLqliWIe+54fmnggLQfw9xEyvr2ve/Q/s7lAIBHbY+GkWxjum YffMYp5srPUsyeLEduVPMcl2HzMtgeTJvIwd3wCLbgHqX9g8bOEV4STycVOGI85yHzJaFZ dGSu5SKjFmmFswAZt3CKaujdND0VMO3XIYwPAD/CLRUUXvxsNgHLitf6wKEQP3RCH+yulW rCoh6Bdf7mouTNNr+sMrlH8Ko3Q6V/Kc+D8o3Rmkvr8O5LRf/mDq+rX9UICHmA== 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 4MjKkD2DcJzxpT; Wed, 5 Oct 2022 16:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 295GS4TQ040680; Wed, 5 Oct 2022 16:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 295GS4ms040679; Wed, 5 Oct 2022 16:28:04 GMT (envelope-from git) Date: Wed, 5 Oct 2022 16:28:04 GMT Message-Id: <202210051628.295GS4ms040679@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Gmelin Subject: git: a9f7f114e5cc - main - sysutils/vagrant: Respect hier(7) for networks.conf 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9f7f114e5cc57963a1ae45720a5ade66aad1598 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664987284; 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=twRbLkVzN6cunXMTOGBZybDgLr3RC/CN1t9Bg+KBh4c=; b=JVfO6vwyljZO/9lR5wdUniXt/egFGfuCJoHvv9MItlO02pPfUs/38reivm9PSYsAGyOCLM 4iW9gtdx4kD6woHBTahpUJU0zMjeFKhP2RiZV2rtlE+mVtxsvcMSw43NrvEzBo5pvObLS5 IpnB0g8epQcOia3Ejy7scnnwOI5aeI5pO1Hp6DbFwFAYMWJ1cfGLw5JVaO2Cgk/uvkWmCb a+qSySKTc7/DBuaVVUGB1+vZzNhlnkrnZybuTNbfrkS1HoNjns185awbrO9Ijbhtw/Vnt2 LX3qdOZLQM8byIr4XmknPWwRL0pevlKL/Xuk4woDxorLuqKXEshOUS3IGdAMHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664987284; a=rsa-sha256; cv=none; b=eY+7MtHIqltQTcuz7Fm2lAcp6PmU4HjKIiTl/M/WWXByRxw45W5g++omw0HO4KAvAjwhkS aP4TOj4JAhL9sHHWdqaeGcmSnQ1/kvSM+Q1aQTgJUwKFMYdrCMc0T139weZs/lh44PYVDw kUUlWYo7Z5PKWI208cxweT4lGy8qCPFpp78X8IctywZGbpCT7p5KT4czYo3SSm92IR4WE4 aXW/uGTTCjmfksTrc+EbOXM4Gg2InOxEH59qzul1ZRYr0ZCE0VaPjkvi0CUXdsrNCfKNxq tycWJ4o3Xprc8UbdjnzsMyAtWXxvtmk0lKX9sv8xuuGpzcwO2F8G5lWTNCgTPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9f7f114e5cc57963a1ae45720a5ade66aad1598 commit a9f7f114e5cc57963a1ae45720a5ade66aad1598 Author: Michael Gmelin AuthorDate: 2022-10-05 13:12:39 +0000 Commit: Michael Gmelin CommitDate: 2022-10-05 16:27:28 +0000 sysutils/vagrant: Respect hier(7) for networks.conf Since virtualbox-ose 6.1.26 there is a new networks.conf file which had originally been placed in /etc/vbox. In 66635b2061daf this was been corrected for emulators/virtualbox-ose, this change does the same for vagrant's virtualbox plugin. Before this change, networks.conf had to be put into two places (e.g., by symlinking /usr/local/etc/vbox to /etc/vbox). PR: 266845 Approved by: joe@thrallingpenguin.com (maintainer) --- sysutils/vagrant/Makefile | 7 +++++-- .../patch-plugins_providers_virtualbox_action_network.rb | 11 +++++++++++ sysutils/vagrant/files/patch-templates_locales_en.yml | 11 +++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile index bbd4d80e264f..2588a87151d8 100644 --- a/sysutils/vagrant/Makefile +++ b/sysutils/vagrant/Makefile @@ -1,7 +1,7 @@ PORTNAME= vagrant PORTVERSION= 2.2.19 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils rubygems devel MAINTAINER= joe@thrallingpenguin.com @@ -70,7 +70,10 @@ BASH_PLIST_FILES= share/bash-completion/completions/vagrant ZSH_PLIST_FILES= share/share/zsh/site-functions/_vagrant post-patch: - @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/bin/vagrant + @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \ + ${WRKSRC}/bin/vagrant \ + ${WRKSRC}/plugins/providers/virtualbox/action/network.rb \ + ${WRKSRC}/templates/locales/en.yml do-build: (cd ${WRKSRC}; (${ECHO_CMD} -e "install:\n\techo\n") > Makefile) diff --git a/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb b/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb new file mode 100644 index 000000000000..b56e62d6909c --- /dev/null +++ b/sysutils/vagrant/files/patch-plugins_providers_virtualbox_action_network.rb @@ -0,0 +1,11 @@ +--- plugins/providers/virtualbox/action/network.rb.orig 2021-11-05 21:15:44 UTC ++++ plugins/providers/virtualbox/action/network.rb +@@ -18,7 +18,7 @@ module VagrantPlugins + class Network + + # Location of the VirtualBox networks configuration file +- VBOX_NET_CONF = "/etc/vbox/networks.conf".freeze ++ VBOX_NET_CONF = "@PREFIX@/etc/vbox/networks.conf".freeze + # Version of VirtualBox that introduced hostonly network range restrictions + HOSTONLY_VALIDATE_VERSION = Gem::Version.new("6.1.28") + # Default valid range for hostonly networks diff --git a/sysutils/vagrant/files/patch-templates_locales_en.yml b/sysutils/vagrant/files/patch-templates_locales_en.yml new file mode 100644 index 000000000000..01d2cceffd37 --- /dev/null +++ b/sysutils/vagrant/files/patch-templates_locales_en.yml @@ -0,0 +1,11 @@ +--- templates/locales/en.yml.orig 2021-11-05 21:15:44 UTC ++++ templates/locales/en.yml +@@ -1863,7 +1863,7 @@ en: + Address: %{address} + Ranges: %{ranges} + +- Valid ranges can be modified in the /etc/vbox/networks.conf file. For ++ Valid ranges can be modified in the @PREFIX@/etc/vbox/networks.conf file. For + more information including valid format see: + + https://www.virtualbox.org/manual/ch06.html#network_hostonly