@@ -21,19 +21,19 @@ diff -rup cloud-init-18.3/cloudinit/sources/helpers/azure.py cloud-init-18.3-new

  from cloudinit.net import dhcp

  from cloudinit import stages

-@@ -16,9 +17,10 @@ from xml.etree import ElementTree

- 

+@@ -18,9 +18,10 @@

  from cloudinit import url_helper

  from cloudinit import util

+ from cloudinit.reporting import events

 +from io import StringIO

  LOG = logging.getLogger(__name__)

 -

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

- @contextmanager

- def cd(newdir):

-@@ -281,6 +283,32 @@ class WALinuxAgentShim(object):

+ azure_ds_reporter = events.ReportEventStack(

+     name="azure-ds",

+@@ -332,6 +333,32 @@

          return dhcp_options

      @staticmethod

@@ -63,9 +63,9 @@ diff -rup cloud-init-18.3/cloudinit/sources/helpers/azure.py cloud-init-18.3-new

 +        return ret

 +

 +    @staticmethod

+     @azure_ds_telemetry_reporter

      def _get_value_from_dhcpoptions(dhcp_options):

          if dhcp_options is None:

-             return None

 @@ -306,8 +334,9 @@ class WALinuxAgentShim(object):

              # Option-245 stored in /run/cloud-init/dhclient.hooks/<ifc>.json

              # a dhclient exit hook that calls cloud-init-dhclient-hook

@@ -1,8 +1,8 @@

 %define python3_sitelib /usr/lib/python3.7/site-packages

 Name:           cloud-init

-Version:        18.3

-Release:        4%{?dist}

+Version:        19.1

+Release:        1%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -10,7 +10,7 @@ URL:            http://launchpad.net/cloud-init

 Vendor:         VMware, Inc

 Distribution:   Photon

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

-%define sha1 cloud-init=a317e2add93578d244328dcf97d46fad1c3140f9

+%define sha1 cloud-init=6de398dd755959dde47c8d6f6e255a0857017c44

 Source1:        cloud-photon.cfg

 Source2:        99-disable-networking-config.cfg

@@ -138,15 +138,17 @@ rm -rf $RPM_BUILD_ROOT

 /lib/systemd/system-generators/cloud-init-generator

 /lib/udev/rules.d/66-azure-ephemeral.rules

 /lib/systemd/system/*

-/etc/bash_completion.d/cloud-init

 %{_docdir}/cloud-init/*

 %{_libdir}/cloud-init/*

 %{python3_sitelib}/*

 %{_bindir}/cloud-init*

+%{_bindir}/cloud-id

+%{_datadir}/bash-completion/completions/cloud-init

 %dir /var/lib/cloud

-

 %changelog

+*   Tue Jun 25 2019 Keerthana K <keerthanak@vmware.com> 19.1-1

+-   Upgrade to version 19.1 and fix cloud-init GOS logic.

 *   Thu Jun 13 2019 Keerthana K <keerthanak@vmware.com> 18.3-4

 -   Fix to delete the contents of /etc/systemd/network dir at the beginning

 -   of write_network instead of looping through each NIC and delete the contents

@@ -53,7 +53,7 @@ cloud_init_modules:

  - resizefs

  - set_hostname

  - update_hostname

-# - update_etc_hosts

+ - update_etc_hosts

 # - ca-certs

 # - rsyslog

  - users-groups

@@ -70,7 +70,7 @@ cloud_config_modules:

 # - set-passwords

  - package-update-upgrade-install

 # - landscape

-# - timezone

+ - timezone

 # - puppet

 # - chef

 # - salt-minion

@@ -105,3 +105,5 @@ system_info:

       templates_dir: /etc/cloud/templates/

    ssh_svcname: sshd

+

+manage_etc_hosts: true

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

 diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/cloudinit/distros/photon.py

-+++ cloud-init-0.7.9-new/cloudinit/distros/photon.py	2017-05-15 05:13:49.156848344 -0700

-@@ -0,0 +1,320 @@

+--- cloud-init-0.7.9/cloudinit/distros/photon.py        1969-12-31 16:00:00.000000000 -0800

+@@ -0,0 +1,335 @@

 +# vi: ts=4 expandtab

 +#

 +# Copyright (C) 2017 VMware Inc.

@@ -9,6 +9,7 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +#

 +

 +import os

++import fnmatch

 +

 +from cloudinit import distros

 +from cloudinit import helpers

@@ -16,6 +17,7 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +from cloudinit import util

 +from cloudinit.distros import net_util

 +from cloudinit.distros.parsers.hostname import HostnameConf

++from cloudinit.net.network_state import mask_to_net_prefix

 +

 +from cloudinit.settings import PER_INSTANCE

 +

@@ -57,7 +59,6 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +        entries = net_util.translate_network(settings)

 +        LOG.debug("Translated ubuntu style network settings %s into %s",

 +                  settings, entries)

-+        util.delete_dir_contents(self.network_conf_dir)

 +        route_entries = []

 +        route_entries = translate_routes(settings)

 +        dev_names = entries.keys()

@@ -66,9 +67,17 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +        searchdomains = []

 +        # Format for systemd

 +        for (dev, info) in entries.items():

++            if 'dns-nameservers' in info:

++                nameservers.extend(info['dns-nameservers'])

++            if 'dns-search' in info:

++                searchdomains.extend(info['dns-search'])

 +            if dev == 'lo':

 +                continue

-+            net_fn = self.network_conf_dir + str(dev_index) + '-' + dev + '.network'

++            net_fn = network_file_name(self.network_conf_dir, dev)

++            if not net_fn:

++               net_fn = self.network_conf_dir + str(dev_index) + '-' + dev + '.network'

++            else:

++                net_fn = self.network_conf_dir + net_fn

 +            dhcp_enabled = 'no'

 +            if info.get('bootproto') == 'dhcp':

 +                dhcp_enabled = 'yes'        

@@ -81,7 +90,7 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +            if info.get('address'):

 +                net_cfg['Address'] = "%s" % (info.get('address'))

 +                if info.get('netmask'):

-+                    net_cfg['Address'] += "/%s" % (info.get('netmask'))

++                    net_cfg['Address'] += "/%s" % (mask_to_net_prefix(info.get('netmask')))

 +            if info.get('gateway'):

 +                net_cfg['Gateway'] = info.get('gateway')

 +            if info.get('dns-nameservers'):

@@ -105,11 +114,6 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +

 +            if info.get('auto'):

 +                self._write_interface_file(net_fn, net_cfg, route_entry)

-+            if 'dns-nameservers' in info:

-+                nameservers.extend(info['dns-nameservers'])

-+            if 'dns-search' in info:

-+                searchdomains.extend(info['dns-search'])

-+            dev_index = dev_index + 1;

 +

 +        resolve_data = []

 +        new_resolve_data = []

@@ -146,6 +150,8 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +                content += "Address=%s\n" % (net_cfg['Address'])

 +            if 'Gateway' in net_cfg:

 +                content += "Gateway=%s\n" % (net_cfg['Gateway'])

++            if 'DHCP' in net_cfg and net_cfg['DHCP'] == 'no':

++                content += "DHCP=%s\n" % (net_cfg['DHCP'])

 +            route_index = 0

 +            found = True

 +            if route_entry:

@@ -322,3 +328,12 @@ diff -rupN cloud-init-0.7.9/cloudinit/distros/photon.py cloud-init-0.7.9-new/clo

 +        else:

 +            out_ifaces[dev_name] = route_info

 +    return out_ifaces

++

++def network_file_name(dirname, dev_name):

++    network_file_pattern = "*"+dev_name+".network*"

++    for node in os.listdir(dirname):

++        node_fullpath = os.path.join(dirname, node)

++        if fnmatch.fnmatch(node, network_file_pattern):

++           util.del_file(node_fullpath)

++           return node

++    return ""

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

 Summary:        Creates a common metadata repository

 Name:           createrepo_c

 Version:        0.11.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2+

 Group:          System Environment/Base

 Vendor:         VMware, Inc.

@@ -20,6 +20,9 @@ BuildRequires:  rpm-devel

 BuildRequires:  xz-devel

 BuildRequires:  sqlite-devel

 BuildRequires:  python3-devel

+%if %{with_check}

+Requires:       libxml2

+%endif

 Obsoletes:      createrepo

 Provides:       createrepo

 Provides:       /bin/mergerepo

@@ -74,6 +77,8 @@ ln -sf %{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo

 %{_lib64dir}/pkgconfig/%{name}.pc

 %changelog

+*   Wed Jun 19 2019 Ankit Jain <ankitja@vmware.com> 0.11.1-2

+-   Added libxml2 as Requires for makecheck.

 *   Tue Sep 04 2018 Keerthana K <keerthanak@vmware.com> 0.11.1-1

 -   Updated to version 0.11.1.

 *   Mon Jun 04 2018 Xiaolin Li <xiaolinl@vmware.com> 0.10.0-2

@@ -1,14 +1,14 @@

 Summary:        Linux kernel packet control tool

 Name:           iptables

-Version:        1.8.0

-Release:        2%{?dist}

+Version:        1.8.3

+Release:        1%{?dist}

 License:        GPLv2+

 URL:            http://www.netfilter.org/projects/iptables

 Group:          System Environment/Security

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2

-%define sha1    %{name}-%{version}=04924fd00dbaf8189f0777af90f7bdb73ac7e47c

+%define sha1    %{name}-%{version}=6df99e90cb4d59032ab2050ebb426fe065249bd3

 Source1:        iptables.service

 Source2:        iptables

 Source3:        iptables.stop

@@ -95,6 +95,8 @@ rm -rf %{buildroot}/*

 %{_mandir}/man3/*

 %changelog

+*   Tue Jul 30 2019 Shreyas B. <shreyasb@vmware.com> 1.8.3-1

+-   Updated to version 1.8.3

 *   Tue Feb 26 2019 Alexey Makhalov <amakhalov@vmware.com> 1.8.0-2

 -   Flush ip6tables on service stop

 *   Mon Sep 10 2018 Ankit Jain <ankitja@vmware.com> 1.8.0-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-aws

 Version:        4.19.52

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Release:        3%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -357,6 +357,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 %endif

 %changelog

+*   Tue Jul 30 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-3

+-   Fix postun script.

 *   Wed Jul 10 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-2

 -   Deprecate linux-aws-tools in favor of linux-tools.

 *   Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-esx

 Version:        4.19.52

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -222,6 +222,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Tue Jul 30 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-4

+-   Fix postun script.

 *   Tue Jul 02 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.52-3

 -   Fix 9p vsock 16bit port issue.

 *   Fri Jun 21 2019 Srinidhi Rao <srinidhir@vmware.com> 4.19.52-2

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-secure

 Version:        4.19.52

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Release:        3%{?kat_build:.%kat_build}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -262,6 +262,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Tue Jul 30 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-3

+-   Fix postun script.

 *   Tue Jul 02 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.52-2

 -   Fix 9p vsock 16bit port issue.

 *   Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        4.19.52

-Release:        5%{?kat_build:.%kat_build}%{?dist}

+Release:        6%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -467,6 +467,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 %endif

 %changelog

+*   Thu Jul 25 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-6

+-   Fix postun scriplet.

 *   Thu Jul 11 2019 Keerthana K <keerthanak@vmware.com> 4.19.52-5

 -   Enable kernel configs necessary for BPF Compiler Collection (BCC).

 *   Wed Jul 10 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-4

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

 %postun

-if [ ! -e /boot/photon.cfg ]

+if [ ! -e /boot/photon.cfg ];

 then

-     if [ `ls /boot/linux-*.cfg 1> /dev/null 2>&1` ]

-     then

-          list=`ls -tu /boot/linux-*.cfg | head -n1`

-          test -n "$list" && ln -sf "$list" /boot/photon.cfg

-     fi

+    list=`ls -tu /boot/linux-*.cfg 2>/dev/null | head -n1`

+    test -n "$list" && ln -sf "$list" /boot/photon.cfg

 fi

new file mode 100644

@@ -0,0 +1,98 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

+Name:           python-deepmerge

+Version:        0.0.5

+Release:        1%{?dist}

+Summary:        Python toolset to deeply merge python dictionaries.

+Group:          Development/Libraries

+License:        MIT

+URL:            https://pypi.org/project/deepmerge

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        https://pypi.python.org/packages/source/n/deepmerge/deepmerge-%{version}.tar.gz

+%define sha1    deepmerge=7479145628eb83eed4ccf8d20e19a56b31fb295c

+BuildRequires:  python2-devel

+BuildRequires:  python-setuptools

+BuildRequires:  python3-devel

+BuildRequires:  python3-setuptools

+BuildRequires:  python-xml

+BuildRequires:  python3-xml

+BuildRequires:  curl-devel

+Requires:       python2

+Requires:       python2-libs

+%if %{with_check}

+BuildRequires:  python-pytest

+BuildRequires:  python3-pytest

+BuildRequires:  python3-atomicwrites

+BuildRequires:  python3-attrs

+BuildRequires:  python3-six

+BuildRequires:  python-atomicwrites

+BuildRequires:  python-attrs

+BuildRequires:  python-six

+BuildRequires:  python-requests

+BuildRequires:  python3-requests

+BuildRequires:  python-pip

+BuildRequires:  python3-pip

+%endif

+BuildArch:      noarch

+

+%description

+A tools to handle merging of nested data structures in python.

+

+%package -n python3-deepmerge

+Summary:        Python toolset to deeply merge python dictionaries.

+Requires:       python3

+Requires:       python3-libs

+

+%description -n python3-deepmerge

+A tools to handle merging of nested data structures in python.

+

+%prep

+%setup -q -n deepmerge-%{version}

+rm -rf ../p3dir

+cp -a . ../p3dir

+

+%build

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

+

+%install

+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

+

+%check

+pushd deepmerge/tests/

+pip install pluggy

+pip install more-itertools

+pip install funcsigs

+pytest2

+popd

+pushd ../p3dir/deepmerge/tests/

+pip3 install pluggy

+pip3 install more-itertools

+pip3 install funcsigs

+pytest3

+popd

+

+%clean

+rm -rf %{buildroot}/*

+

+

+%files

+%defattr(-,root,root)

+%doc README.rst

+%{python2_sitelib}/*

+

+%files -n python3-deepmerge

+%defattr(-,root,root)

+%doc README.rst

+%{python3_sitelib}/*

+

+%changelog

+*  Wed Jul 23 2019 Tapas Kundu <tkundu@vmware.com> 0.0.5-1

+-  Initial packaging for photon OS

@@ -1,11 +1,11 @@

 Summary:        lightweight java application to send metrics to.

 Name:           wavefront-proxy

-Version:        4.32

-Release:        2%{?dist}

+Version:        4.39

+Release:        1%{?dist}

 License:        Apache 2.0

 URL:            https://github.com/wavefrontHQ/java

 Source0:        https://github.com/wavefrontHQ/java/archive/wavefront-%{version}.tar.gz

-%define sha1    wavefront=216c16125c6308debcffc1d6bd3969b9ea5013eb

+%define sha1    wavefront=de9bd09c3311176cac2183ec031fd39b52a44c56

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -45,7 +45,11 @@ sed -i 's/\/etc\/init.d\/$APP_BASE-proxy restart/ systemctl restart $APP_BASE-pr

 sed -i 's/-jar \/opt\/wavefront\/wavefront-proxy\/bin\/wavefront-push-agent.jar/-jar \/opt\/wavefront-push-agent.jar/' proxy/docker/run.sh

 %build

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

 mvn install -DskipTests

+%else

+mvn install

+%endif

 %install

 install -m 755 -D pkg/opt/wavefront/wavefront-proxy/bin/autoconf-wavefront-proxy.sh %{buildroot}/opt/wavefront/%{name}/bin/autoconf-wavefront-proxy.sh

@@ -104,6 +108,8 @@ rm -rf %{buildroot}/*

 %{_unitdir}/wavefront-proxy.service

 %changelog

+* Mon Jul 29 2019 Shreyas B. <shreyasb@vmware.com> 4.39-1

+- Updated to 4.39

 * Wed Jul 10 2019 Alexey Makhalov <amakhalov@vmware.com> 4.32-2

 - Skip tests during make install.

 * Thu Dec 06 2018 Ankit Jain <ankitja@vmware.com> 4.32-1

@@ -240,7 +240,8 @@ class PackageUtils(object):

         if constants.rpmCheck and package in constants.testForceRPMS:

             self.logger.debug("#" * (68 + 2 * len(package)))

-            if not SPECS.getData().isCheckAvailable(package, version):

+            if (not SPECS.getData().isCheckAvailable(package, version)) or \

+                    (package in constants.listMakeCheckPkgToSkip):

                 self.logger.info("####### " + package +

                                  " MakeCheck is not available. Skipping MakeCheck TEST for " +

                                  package + " #######")

@@ -264,7 +265,8 @@ class PackageUtils(object):

         returnVal = sandbox.run(rpmBuildcmd, logfile = logFile)

         if constants.rpmCheck and package in constants.testForceRPMS:

-            if not SPECS.getData().isCheckAvailable(package, version):

+            if (not SPECS.getData().isCheckAvailable(package, version)) or \

+                    (package in constants.listMakeCheckPkgToSkip):

                 constants.testLogger.info(package + " : N/A")

             elif returnVal == 0:

                 constants.testLogger.info(package + " : PASS")

@@ -287,6 +287,15 @@ class constants(object):

         "glibc",

         "tar"]

+    # List of Packages which causes "Makecheck" job

+    # to stuck indefinately or getting failed.

+    # Until these pkgs %check is fixed, these pkgs will be

+    # skip to run makecheck.

+    listMakeCheckPkgToSkip = [

+        "gtk-doc",

+        "libmspack",

+        "socat"]

+

     # .spec file might contain lines such as

     # Requires(post):/sbin/useradd

     # Build system should interpret it as