deleted file mode 100644

@@ -1,30 +0,0 @@

-From 25326a39a51996f37ef8c3cb976fe31c041a2edd Mon Sep 17 00:00:00 2001

-From: James Falcon <james.falcon@canonical.com>

-Date: Fri, 12 Aug 2022 10:52:50 -0500

-Subject: [PATCH] Return cc_set_hostname to PER_INSTANCE frequency (#1651)

-

-In 96eb95a the frequency was inadvertently changed to ALWAYS due to

-the documentation being incorrect. The code and documentation should

-now align to be PER_INSTANCE.

-

-LP: #1983811

- cloudinit/config/cc_set_hostname.py | 4 ++--

- 1 file changed, 2 insertions(+), 2 deletions(-)

-

-diff --git a/cloudinit/config/cc_set_hostname.py b/cloudinit/config/cc_set_hostname.py

-index 2a4c565f70..3ea9e4ed8e 100644

-+++ b/cloudinit/config/cc_set_hostname.py

-@@ -14,9 +14,9 @@

- from cloudinit.atomic_helper import write_json

- from cloudinit.config.schema import MetaSchema, get_meta_doc

- from cloudinit.distros import ALL_DISTROS

--from cloudinit.settings import PER_ALWAYS

-+from cloudinit.settings import PER_INSTANCE

- 

--frequency = PER_ALWAYS

-+frequency = PER_INSTANCE

- MODULE_DESCRIPTION = """\

- This module handles setting the system hostname and fully qualified domain

- name (FQDN). If ``preserve_hostname`` is set, then the hostname will not be

@@ -1,32 +1,32 @@

 diff --git a/cloudinit/sources/helpers/azure.py b/cloudinit/sources/helpers/azure.py

-index d07dc3c0..c5d93a7d 100755

+index 56f44339..bf4398d9 100644

 --- a/cloudinit/sources/helpers/azure.py

 +++ b/cloudinit/sources/helpers/azure.py

 @@ -1,5 +1,6 @@

  # This file is part of cloud-init. See LICENSE file for license information.

  import base64

 +import configobj

+ import enum

  import json

  import logging

- import os

-@@ -19,6 +20,7 @@ from cloudinit import (

- from cloudinit import distros, subp, temp_utils, url_helper, util, version

+@@ -20,6 +21,7 @@ from xml.sax.saxutils import escape

+ from cloudinit import distros, dmi, subp, temp_utils, url_helper, util, version

  from cloudinit.reporting import events

  from cloudinit.settings import CFG_BUILTIN

 +from io import StringIO

  LOG = logging.getLogger(__name__)

-@@ -59,6 +61,8 @@ DEFAULT_REPORT_FAILURE_USER_VISIBLE_MESSAGE = (

+@@ -50,6 +52,8 @@ DEFAULT_REPORT_FAILURE_USER_VISIBLE_MESSAGE = (

      "for more information on remediation."

  )

 +NETWORKD_LEASES_DIR = '/run/systemd/netif/leases'

 +

-

+ 

  def azure_ds_telemetry_reporter(func):

      def impl(*args, **kwargs):

-@@ -942,6 +945,32 @@ class WALinuxAgentShim:

+@@ -956,6 +960,32 @@ class WALinuxAgentShim:

          report_diagnostic_event(msg, logger_func=LOG.debug)

          return goal_state

new file mode 100644

@@ -0,0 +1,368 @@

+From 70ce64428119be5b21b188994b72f2ebb65a0c57 Mon Sep 17 00:00:00 2001

+From: James Falcon <james.falcon@canonical.com>

+Date: Tue, 30 Aug 2022 14:26:03 -0500

+Subject: [PATCH] Fix v2 interface matching when no MAC

+

+Commit af40478 added a regression. When parsing v2 config, matching can

+fail when no MAC is available. This commit fixes that behavior.

+

+LP: #1986551

+---

+ cloudinit/cmd/devel/net_convert.py            |   2 +-

+ cloudinit/distros/__init__.py                 |   4 +-

+ cloudinit/net/network_state.py                |  13 ++-

+ cloudinit/net/networkd.py                     |   6 +-

+ tests/unittests/conftest.py                   |  10 ++

+ .../cloud-init-encc000.2653.nmconnection      |  21 ++++

+ .../cloud-init-encc000.nmconnection           |  12 +++

+ .../cloud-init-zz-all-en.nmconnection         |  16 +++

+ .../cloud-init-zz-all-eth.nmconnection        |  16 +++

+ .../net/artifacts/no_matching_mac_v2.yaml     |  22 ++++

+ tests/unittests/net/test_net_rendering.py     | 101 ++++++++++++++++++

+ 11 files changed, 212 insertions(+), 11 deletions(-)

+ create mode 100644 tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.2653.nmconnection

+ create mode 100644 tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.nmconnection

+ create mode 100644 tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-en.nmconnection

+ create mode 100644 tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-eth.nmconnection

+ create mode 100644 tests/unittests/net/artifacts/no_matching_mac_v2.yaml

+ create mode 100644 tests/unittests/net/test_net_rendering.py

+

+diff --git a/cloudinit/cmd/devel/net_convert.py b/cloudinit/cmd/devel/net_convert.py

+index 50e268a293..269d72cd5a 100755

+--- a/cloudinit/cmd/devel/net_convert.py

+@@ -140,7 +140,7 @@ def handle_args(name, args):

+         config = distro.renderer_configs.get("eni")

+     elif args.output_kind == "netplan":

+         r_cls = netplan.Renderer

+-        config = distro.renderer_configs.get("netplan")

++        config = distro.renderer_configs.get("netplan", {})

+         # don't run netplan generate/apply

+         config["postcmds"] = False

+         # trim leading slash

+diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py

+index 8de3955e34..4a468cf8ca 100644

+--- a/cloudinit/distros/__init__.py

+@@ -16,7 +16,7 @@

+ import string

+ import urllib.parse

+ from io import StringIO

+-from typing import Any, Mapping, Optional, Type

++from typing import Any, Mapping, MutableMapping, Optional, Type

+ 

+ from cloudinit import importer

+ from cloudinit import log as logging

+@@ -79,7 +79,7 @@ class Distro(persistence.CloudInitPickleMixin, metaclass=abc.ABCMeta):

+     tz_zone_dir = "/usr/share/zoneinfo"

+     default_owner = "root:root"

+     init_cmd = ["service"]  # systemctl, service etc

+-    renderer_configs: Mapping[str, Mapping[str, Any]] = {}

++    renderer_configs: Mapping[str, MutableMapping[str, Any]] = {}

+     _preferred_ntp_clients = None

+     networking_cls: Type[Networking] = LinuxNetworking

+     # This is used by self.shutdown_command(), and can be overridden in

+diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py

+index fd92bf0eb7..e4f7a7fdcb 100644

+--- a/cloudinit/net/network_state.py

+@@ -796,7 +796,7 @@ def handle_wifis(self, command):

+             " netplan rendering support."

+         )

+ 

+-    def _v2_common(self, cfg):

++    def _v2_common(self, cfg) -> None:

+         LOG.debug("v2_common: handling config:\n%s", cfg)

+         for iface, dev_cfg in cfg.items():

+             if "set-name" in dev_cfg:

+@@ -813,10 +813,13 @@ def _v2_common(self, cfg):

+                     name_cmd.update({"address": dns})

+                 self.handle_nameserver(name_cmd)

+ 

+-                mac_address = dev_cfg.get("match", {}).get("macaddress")

+-                real_if_name = find_interface_name_from_mac(mac_address)

+-                if real_if_name:

+-                    iface = real_if_name

++                mac_address: Optional[str] = dev_cfg.get("match", {}).get(

++                    "macaddress"

++                )

++                if mac_address:

++                    real_if_name = find_interface_name_from_mac(mac_address)

++                    if real_if_name:

++                        iface = real_if_name

+ 

+                 self._handle_individual_nameserver(name_cmd, iface)

+ 

+diff --git a/cloudinit/net/networkd.py b/cloudinit/net/networkd.py

+index abfc1037ee..e0a5d84814 100644

+--- a/cloudinit/net/networkd.py

+@@ -255,7 +255,7 @@ def _render_content(self, ns):

+                 self.parse_routes(route, cfg)

+ 

+             if ns.version == 2:

+-                name = iface["name"]

++                name: Optional[str] = iface["name"]

+                 # network state doesn't give dhcp domain info

+                 # using ns.config as a workaround here

+ 

+@@ -270,8 +270,8 @@ def _render_content(self, ns):

+                         if dev_cfg.get("set-name") == name:

+                             name = dev_name

+                             break

+-

+-                self.dhcp_domain(ns.config["ethernets"][name], cfg)

++                if name in ns.config["ethernets"]:

++                    self.dhcp_domain(ns.config["ethernets"][name], cfg)

+ 

+             ret_dict.update({link: cfg.get_final_conf()})

+ 

+diff --git a/tests/unittests/conftest.py b/tests/unittests/conftest.py

+index e265a285ca..1ab17e8b10 100644

+--- a/tests/unittests/conftest.py

+@@ -1,6 +1,7 @@

+ import builtins

+ import glob

+ import os

++from pathlib import Path

+ 

+ import pytest

+ 

+@@ -55,3 +56,12 @@ def fake_filesystem(mocker, tmpdir):

+             func = getattr(mod, f)

+             trap_func = retarget_many_wrapper(str(tmpdir), nargs, func)

+             mocker.patch.object(mod, f, trap_func)

++

++

++PYTEST_VERSION_TUPLE = tuple(map(int, pytest.__version__.split(".")))

++

++if PYTEST_VERSION_TUPLE < (3, 9, 0):

++

++    @pytest.fixture

++    def tmp_path(tmpdir):

++        return Path(tmpdir)

+diff --git a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.2653.nmconnection b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.2653.nmconnection

+new file mode 100644

+index 0000000000..80483d4f00

+--- /dev/null

+@@ -0,0 +1,21 @@

++# Generated by cloud-init. Changes will be lost.

++

++[connection]

++id=cloud-init encc000.2653

++uuid=116aaf19-aabc-50ea-b480-e9aee18bda59

++type=vlan

++interface-name=encc000.2653

++

++[user]

++org.freedesktop.NetworkManager.origin=cloud-init

++

++[vlan]

++id=2653

++parent=f869ebd3-f175-5747-bf02-d0d44d687248

++

++[ipv4]

++method=manual

++may-fail=false

++address1=10.245.236.14/24

++gateway=10.245.236.1

++dns=10.245.236.1;

+diff --git a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.nmconnection b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-encc000.nmconnection

+new file mode 100644

+index 0000000000..3368388d4a

+--- /dev/null

+@@ -0,0 +1,12 @@

++# Generated by cloud-init. Changes will be lost.

++

++[connection]

++id=cloud-init encc000

++uuid=f869ebd3-f175-5747-bf02-d0d44d687248

++type=ethernet

++interface-name=encc000

++

++[user]

++org.freedesktop.NetworkManager.origin=cloud-init

++

++[ethernet]

+diff --git a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-en.nmconnection b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-en.nmconnection

+new file mode 100644

+index 0000000000..16120bc179

+--- /dev/null

+@@ -0,0 +1,16 @@

++# Generated by cloud-init. Changes will be lost.

++

++[connection]

++id=cloud-init zz-all-en

++uuid=159daec9-cba3-5101-85e7-46d831857f43

++type=ethernet

++interface-name=zz-all-en

++

++[user]

++org.freedesktop.NetworkManager.origin=cloud-init

++

++[ethernet]

++

++[ipv4]

++method=auto

++may-fail=false

+diff --git a/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-eth.nmconnection b/tests/unittests/net/artifacts/no_matching_mac/etc/NetworkManager/system-connections/cloud-init-zz-all-eth.nmconnection

+new file mode 100644

+index 0000000000..df44d546c8

+--- /dev/null

+@@ -0,0 +1,16 @@

++# Generated by cloud-init. Changes will be lost.

++

++[connection]

++id=cloud-init zz-all-eth

++uuid=23a83d8a-d7db-5133-a77b-e68a6ac61ec9

++type=ethernet

++interface-name=zz-all-eth

++

++[user]

++org.freedesktop.NetworkManager.origin=cloud-init

++

++[ethernet]

++

++[ipv4]

++method=auto

++may-fail=false

+diff --git a/tests/unittests/net/artifacts/no_matching_mac_v2.yaml b/tests/unittests/net/artifacts/no_matching_mac_v2.yaml

+new file mode 100644

+index 0000000000..f5fc5ef10a

+--- /dev/null

+@@ -0,0 +1,22 @@

++network:

++  version: 2

++  ethernets:

++    encc000: {}

++    zz-all-en:

++      match:

++        name: "en*"

++      dhcp4: true

++    zz-all-eth:

++      match:

++        name: "eth*"

++      dhcp4: true

++  vlans:

++    encc000.2653:

++      id: 2653

++      link: "encc000"

++      addresses:

++        - "10.245.236.14/24"

++      gateway4: "10.245.236.1"

++      nameservers:

++        addresses:

++          - "10.245.236.1"

+diff --git a/tests/unittests/net/test_net_rendering.py b/tests/unittests/net/test_net_rendering.py

+new file mode 100644

+index 0000000000..06feab8914

+--- /dev/null

+@@ -0,0 +1,101 @@

++"""Home of the tests for end-to-end net rendering

++

++Tests defined here should take a v1 or v2 yaml config as input, and verify

++that the rendered network config is as expected. Input files are defined

++under `tests/unittests/net/artifacts` with the format of

++

++<test_name><format>.yaml

++

++For example, if my test name is "test_all_the_things" and I'm testing a

++v2 format, I should have a file named test_all_the_things_v2.yaml.

++

++If a renderer outputs multiple files, the expected files should live in

++the artifacts directory under the given test name. For example, if I'm

++expecting NetworkManager to output a file named eth0.nmconnection as

++part of my "test_all_the_things" test, then in the artifacts directory

++there should be a

++`test_all_the_things/etc/NetworkManager/system-connections/eth0.nmconnection`

++file.

++

++To add a new nominal test, create the input and output files, then add the test

++name to the `test_convert` test along with it's supported renderers.

++

++Before adding a test here, check that it is not already represented

++in `unittests/test_net.py`. While that file contains similar tests, it has

++become too large to be maintainable.

++"""

++import glob

++from enum import Flag, auto

++from pathlib import Path

++

++import pytest

++

++from cloudinit import safeyaml

++from cloudinit.net.netplan import Renderer as NetplanRenderer

++from cloudinit.net.network_manager import Renderer as NetworkManagerRenderer

++from cloudinit.net.network_state import NetworkState, parse_net_config_data

++

++ARTIFACT_DIR = Path(__file__).parent.absolute() / "artifacts"

++

++

++class Renderer(Flag):

++    Netplan = auto()

++    NetworkManager = auto()

++    Networkd = auto()

++

++

++@pytest.fixture(autouse=True)

++def setup(mocker):

++    mocker.patch("cloudinit.net.network_state.get_interfaces_by_mac")

++

++

++def _check_netplan(

++    network_state: NetworkState, netplan_path: Path, expected_config

++):

++    if network_state.version == 2:

++        renderer = NetplanRenderer(config={"netplan_path": netplan_path})

++        renderer.render_network_state(network_state)

++        assert safeyaml.load(netplan_path.read_text()) == expected_config, (

++            f"Netplan config generated at {netplan_path} does not match v2 "

++            "config defined for this test."

++        )

++    else:

++        raise NotImplementedError

++

++

++def _check_network_manager(network_state: NetworkState, tmp_path: Path):

++    renderer = NetworkManagerRenderer()

++    renderer.render_network_state(

++        network_state, target=str(tmp_path / "no_matching_mac")

++    )

++    expected_paths = glob.glob(

++        str(ARTIFACT_DIR / "no_matching_mac" / "**/*.nmconnection"),

++        recursive=True,

++    )

++    for expected_path in expected_paths:

++        expected_contents = Path(expected_path).read_text()

++        actual_path = tmp_path / expected_path.split(

++            str(ARTIFACT_DIR), maxsplit=1

++        )[1].lstrip("/")

++        assert (

++            actual_path.exists()

++        ), f"Expected {actual_path} to exist, but it does not"

++        actual_contents = actual_path.read_text()

++        assert expected_contents.strip() == actual_contents.strip()

++

++

++@pytest.mark.parametrize(

++    "test_name, renderers",

++    [("no_matching_mac_v2", Renderer.Netplan | Renderer.NetworkManager)],

++)

++def test_convert(test_name, renderers, tmp_path):

++    network_config = safeyaml.load(

++        Path(ARTIFACT_DIR, f"{test_name}.yaml").read_text()

++    )

++    network_state = parse_net_config_data(network_config["network"])

++    if Renderer.Netplan in renderers:

++        _check_netplan(

++            network_state, tmp_path / "netplan.yaml", network_config

++        )

++    if Renderer.NetworkManager in renderers:

++        _check_network_manager(network_state, tmp_path)

@@ -1,6 +1,6 @@

 Name:           cloud-init

-Version:        22.2.2

-Release:        2%{?dist}

+Version:        22.3

+Release:        1%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -9,13 +9,13 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz

-%define sha512  %{name}=18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf

+%define sha512  %{name}=50675caf75d5b5535782b87d7bdefa92740f575bb82d86bf72ed696a00713da4c6e15f06b6001497e84f5ec11e0a90d7322d118cd5d931f57805af2ca43fc646

 Patch0: cloud-init-azureds.patch

 Patch1: ds-identify.patch

 Patch2: ds-vmware-photon.patch

 Patch3: cloud-cfg.patch

-Patch4: cc_set_hostname_fix.patch

+Patch4: cloud-init-interface-match-without-mac.patch

 BuildRequires: python3-devel

 BuildRequires: systemd-devel

@@ -41,6 +41,7 @@ BuildRequires: python3-configobj

 BuildRequires: python3-jsonpatch

 BuildRequires: python3-pytest

 BuildRequires: python3-jsonschema

+BuildRequires: python3-pyserial

 %endif

 Requires: iproute2

@@ -60,6 +61,7 @@ Requires: python3-setuptools

 Requires: python3-xml

 Requires: python3-jsonschema

 Requires: python3-netifaces

+Requires: python3-pyserial

 Requires: dhcp-client

 BuildArch: noarch

@@ -104,9 +106,10 @@ echo -e 'CERT1\nLINE2\nLINE3\nCERT2\nLINE2\nLINE3' > "${crt_file}"

 conf_file='%{_sysconfdir}/ca-certificates.conf'

-%define test_pkgs pytest-metadata unittest2 mock attrs iniconfig httpretty netifaces responses pytest-mock

+%define pkglist1 pytest-metadata unittest2 mock attrs iniconfig

+%define pkglist2 httpretty netifaces responses pytest-mock

-pip3 install --upgrade %test_pkgs

+pip3 install --upgrade %{pkglist1} %{pkglist2}

 make check %{?_smp_mflags}

 %endif

@@ -134,6 +137,7 @@ rm -rf %{buildroot}

 %dir %{_sharedstatedir}/cloud

 %dir %{_sysconfdir}/cloud/templates

 %doc %{_sysconfdir}/cloud/cloud.cfg.d/README

+%doc %{_sysconfdir}/cloud/clean.d/README

 %{_sysconfdir}/dhcp/dhclient-exit-hooks.d/hook-dhclient

 %{_sysconfdir}/NetworkManager/dispatcher.d/hook-network-manager

 %config(noreplace) %{_sysconfdir}/cloud/templates/*

@@ -146,6 +150,9 @@ rm -rf %{buildroot}

 %{_sysconfdir}/systemd/system/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf

 %changelog

+* Tue Aug 23 2022 Shivani Agarwal <shivania2@vmware.com> 22.3-1

+- Upgrade to v22.3

+- Add patch to fix interface matching when no MAC

 * Sat Aug 13 2022 Shreenidhi Shedi <sshedi@vmware.com> 22.2.2-2

 - Fix hostname setting issue

 * Fri Jul 01 2022 Shreenidhi Shedi <sshedi@vmware.com> 22.2.2-1

@@ -9,7 +9,7 @@ Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>

  1 file changed, 125 insertions(+), 3 deletions(-)

 diff --git a/cloudinit/sources/DataSourceVMware.py b/cloudinit/sources/DataSourceVMware.py

-index 6ef7c9d5..e886ea1e 100644

+index 80a01e89..9e4c70f1 100644

 --- a/cloudinit/sources/DataSourceVMware.py

 +++ b/cloudinit/sources/DataSourceVMware.py

 @@ -73,6 +73,7 @@ import netifaces

@@ -17,7 +17,7 @@ index 6ef7c9d5..e886ea1e 100644

  from cloudinit import dmi

  from cloudinit import log as logging

 +from cloudinit.net import network_state

- from cloudinit import sources, util

+ from cloudinit import net, sources, util

  from cloudinit.subp import ProcessExecutionError, subp, which

 @@ -83,6 +84,7 @@ NOVAL = "No value found"

@@ -189,6 +189,3 @@ index 6ef7c9d5..e886ea1e 100644

          else:

              return sources.METADATA_UNKNOWN

-2.35.1

-

deleted file mode 100644

@@ -1,36 +0,0 @@

-From be635a7eaf7bd19177b7002aa2c793c78be77ecc Mon Sep 17 00:00:00 2001

-From: John Wolfe <jwolfe@vmware.com>

-Date: Wed, 10 Aug 2022 07:20:28 -0700

-Subject: [PATCH] Properly check authorization on incoming guestOps requests

-

-Fix public pipe request checks.  Only a SessionRequest type should

-be accepted on the public pipe.

- open-vm-tools/vgauth/serviceImpl/proto.c | 6 +++++-

- 1 file changed, 5 insertions(+), 1 deletion(-)

-

-diff --git a/open-vm-tools/vgauth/serviceImpl/proto.c b/open-vm-tools/vgauth/serviceImpl/proto.c

-index db7159e..c4f85b0 100644

-+++ b/open-vm-tools/vgauth/serviceImpl/proto.c

-@@ -1,5 +1,5 @@

- /*********************************************************

-- * Copyright (C) 2011-2016,2019-2021 VMware, Inc. All rights reserved.

-+ * Copyright (c) 2011-2016,2019-2022 VMware, Inc. All rights reserved.

-  *

-  * This program is free software; you can redistribute it and/or modify it

-  * under the terms of the GNU Lesser General Public License as published

-@@ -1201,6 +1201,10 @@ Proto_SecurityCheckRequest(ServiceConnection *conn,

-    VGAuthError err;

-    gboolean isSecure = ServiceNetworkIsConnectionPrivateSuperUser(conn);

- 

-+   if (conn->isPublic && req->reqType != PROTO_REQUEST_SESSION_REQ) {

-+      return VGAUTH_E_PERMISSION_DENIED;

-+   }

-+

-    switch (req->reqType) {

-       /*

-        * This comes over the public connection; alwsys let it through.

-2.6.2

-

@@ -3,18 +3,20 @@

 Summary:        Usermode tools for VMware virts

 Name:           open-vm-tools

-Version:        12.0.5

-Release:        2%{?dist}

+Version:        12.1.0

+Release:        1%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/vmware/open-vm-tools

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Source0:        https://github.com/vmware/open-vm-tools/archive/%{name}-stable-%{version}.tar.gz

-%define sha512 %{name}=c5503caa8a6d4a7e0a18066781448bba4a800288b1a0e788204d57faf039cddfd297e809e006a5d37e336ba96bfc42ec6d33ab540c0ce62dd59c8a946df8d6ed

+Source0: https://github.com/vmware/open-vm-tools/archive/%{name}-stable-%{version}.tar.gz

+%define sha512 %{name}=9280decf20381de56174bfdbab9a86c525f992ce35eda499938c9b6b00e59a012a4410fd2972bbc52f8951bb071042cc7bf77fc1d687acc7980cc54a26461aed

+

 Source1:        https://gitlab.eng.vmware.com/photon-gosc/gosc-scripts/-/archive/%{gosc_ver}/gosc-scripts-%{gosc_ver}.tar.gz

 %define sha512 %{gosc_scripts}-%{gosc_ver}=b88d46d480edf169f1e12b4a760d2b00d705dc428b3b5ec614cc9d323871ea501f7ebce2885a2e9aaf4a60662481c62d2504b471e58a7f6d0482fe9cfe76c4ec

+

 Source2:        vmtoolsd.service

 Source3:        vgauthd.service

@@ -22,11 +24,10 @@ Source3:        vgauthd.service

 # If patch is taken from gosc-scripts repo, prefix it with 'gosc-'

 Patch0:     ovt-linux-deployment.patch

 Patch1:     gosc-root-password-update.patch

-Patch2:     CVE-2022-31676.patch

 %if "%{_arch}" == "aarch64"

 # TODO: This must be removed once VMCI config is enabled in aarch64 kernel

-Patch3:     ovt-unknown-ioctl.patch

+Patch2:     ovt-unknown-ioctl.patch

 %endif

 BuildRequires:  glib-devel

@@ -63,18 +64,18 @@ Requires: systemd >= 239-23

 VMware virtualization user mode tools

 %package        devel

-Summary:        Header and development files for open-vm-tools

+Summary:        Header and development files for %{name}

 Requires:       %{name} = %{version}-%{release}

 %description    devel

 It contains the libraries and header files to create applications.

 %package        sdmp

-Summary:        Service Discovery plugin for open-vm-tools

+Summary:        Service Discovery plugin for %{name}

 Requires:       %{name} = %{version}-%{release}

 %description    sdmp

-The "open-vm-tools-sdmp" package contains a plugin for Service Discovery.

+The "%{name}-sdmp" package contains a plugin for Service Discovery.

 %package        gosc

 Summary:        GOSC scripts

@@ -98,7 +99,7 @@ autoreconf -i

            --with-tirpc \

            --enable-servicediscovery

-make %{?_smp_mflags}

+%make_build

 %install

 #collecting hacks to manually drop the vmhgfs module

@@ -109,14 +110,11 @@ install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}

 install -p -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}

 cd %{name}

-make DESTDIR=%{buildroot} install %{?_smp_mflags}

+%make_install %{?_smp_mflags}

 chmod -x %{buildroot}/etc/pam.d/vmtoolsd

 find %{buildroot}%{_libdir} -name '*.la' -delete

-%check

-make %{?_smp_mflags} check

-

 %post

 /sbin/ldconfig

 %systemd_post vgauthd.service vmtoolsd.service

@@ -179,6 +177,8 @@ fi

 %{_datadir}/%{name}/%{gosc_scripts}

 %changelog

+* Sat Aug 27 2022 Shreenidhi Shedi <sshedi@vmware.com> 12.1.0-1

+- Upgrade to v12.1.0

 * Wed Aug 17 2022 Shivani Agarwal <shivania2@vmware.com> 12.0.5-2

 - Fix CVE-2022-31676

 * Thu May 26 2022 Shivani Agarwal <shivania2@vmware.com> 12.0.5-1

new file mode 100644

@@ -0,0 +1,51 @@

+Summary:    Python serial port access library

+Name:       python3-pyserial

+Version:    3.5

+Release:    1%{?dist}

+License:    BSD

+Vendor:     VMware, Inc.

+Group:      Development/Libraries

+Distribution: Photon

+URL:        http://pypi.python.org/pypi/pyserial

+

+Source0: https://github.com/pyserial/pyserial/archive/refs/tags/pyserial-%{version}.tar.gz

+%define sha512 pyserial=c2a700f5e08905bdab070c95cec41d6d423c20d2a9648c8c2f048db86de72f39fe2b8df560172d5b9d480be44c35ff0799df8f1d684d3f41f8fc61174105256e

+

+BuildRequires: python3-devel

+BuildRequires: python3-setuptools

+

+Requires: python3

+

+BuildArch: noarch

+

+%description

+This module encapsulates the access for the serial port. It provides backends

+for standard Python running on Windows, Linux, BSD (possibly any POSIX

+compliant system) and Jython. The module named "serial" automatically selects

+the appropriate backend.

+

+%prep

+%autosetup -p1 -n pyserial-%{version}

+

+%build

+%py3_build

+

+%install

+%py3_install

+

+%if 0%{?with_check}

+%check

+export PYTHONPATH=%{buildroot}%{python3_sitelib}

+%{python3} test/run_all_tests.py

+%endif

+

+%files

+%doc LICENSE.txt CHANGES.rst README.rst examples

+%{python3_sitelib}/serial

+%{python3_sitelib}/pyserial-%{version}-py%{python3_version}.egg-info

+%{_bindir}/pyserial-miniterm

+%{_bindir}/pyserial-ports

+

+%changelog

+* Mon Aug 29 2022 Shreenidhi Shedi <sshedi@vmware.com> 3.5-1

+- Initial build, needed for cloud-init >= v22.3