@@ -1,22 +1,21 @@

 Name:           WALinuxAgent

 Summary:        The Windows Azure Linux Agent

-Version:        2.2.22

+Version:        2.2.35

 Release:        1%{?dist}

 License:        Apache License Version 2.0

 Group:          System/Daemons

 Url:            https://github.com/Azure/WALinuxAgent

 Source0:        %{name}-%{version}.tar.gz

 Patch0:         photondistroadd.patch

-%define sha1 WALinuxAgent=e8389d8f5982df5d8d59f7475df22d87c5f4d031

+%define sha1 WALinuxAgent=2cebed7efab54adb634c97519900f7a1de55403a

 Vendor:		VMware, Inc.

 Distribution:	Photon

-

 BuildRequires:  python2

 BuildRequires:  python2-libs

 BuildRequires:  python-setuptools

 BuildRequires:  python-xml

 BuildRequires:  systemd

-

+BuildRequires:  python-distro

 Requires:       python2

 Requires:       python2-libs

 Requires:       python-xml

@@ -29,7 +28,6 @@ Requires:       /bin/grep

 Requires:       sudo

 Requires:       iptables

 Requires:       systemd

-

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 BuildArch:      noarch

@@ -78,6 +76,8 @@ python2 setup.py check && python2 setup.py test

 /usr/lib/python2.7/site-packages/*

 %changelog

+* Tue Feb 12 2019 Tapas Kundu <tkundu@vmware.com> 2.2.35-1

+- Update to 2.2.35

 * Wed Feb 28 2018 Anish Swaminathan <anishs@vmware.com> 2.2.22-1

 - Update to 2.2.22

 * Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.14-2

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

-diff -rupN WALinuxAgent-2.2.22/azurelinuxagent/common/osutil/factory.py WALinuxAgent-2.2.22-new/azurelinuxagent/common/osutil/factory.py

-+++ WALinuxAgent-2.2.22-new/azurelinuxagent/common/osutil/factory.py	2018-02-28 17:24:49.320447232 -0800

+--- a/azurelinuxagent/common/osutil/factory.py	2019-02-12 18:32:02.014403649 +0530

 @@ -21,6 +21,7 @@ from azurelinuxagent.common.version impo

  from .default import DefaultOSUtil

  from .arch import ArchUtil

@@ -9,19 +8,19 @@ diff -rupN WALinuxAgent-2.2.22/azurelinuxagent/common/osutil/factory.py WALinuxA

  from .coreos import CoreOSUtil

  from .debian import DebianOSUtil

  from .freebsd import FreeBSDOSUtil

-@@ -46,6 +47,9 @@ def get_osutil(distro_name=DISTRO_NAME,

-             or distro_name == "clear linux software for intel architecture":

+@@ -49,6 +50,10 @@ def get_osutil(distro_name=DISTRO_NAME,

+     if "Clear Linux" in distro_full_name:

          return ClearLinuxUtil()

 +    if distro_name == "photonos":

 +        return PhotonOSUtil()

 +

++

      if distro_name == "ubuntu":

          if Version(distro_version) in [Version("12.04"), Version("12.10")]:

              return Ubuntu12OSUtil()

-diff -rupN WALinuxAgent-2.2.22/azurelinuxagent/common/osutil/photonos.py WALinuxAgent-2.2.22-new/azurelinuxagent/common/osutil/photonos.py

-+++ WALinuxAgent-2.2.22-new/azurelinuxagent/common/osutil/photonos.py	2018-02-28 17:24:49.320447232 -0800

+--- a/azurelinuxagent/common/osutil/photonos.py	2019-02-12 18:42:54.290386210 +0530

 @@ -0,0 +1,88 @@

 +#

 +# Copyright 2017 Microsoft Corporation

@@ -111,24 +110,20 @@ diff -rupN WALinuxAgent-2.2.22/azurelinuxagent/common/osutil/photonos.py WALinux

 +        except IOError as e:

 +            raise OSUtilError("Failed to delete root password:{0}".format(e))

 +        pass

-diff -rupN WALinuxAgent-2.2.22/azurelinuxagent/common/version.py WALinuxAgent-2.2.22-new/azurelinuxagent/common/version.py

-+++ WALinuxAgent-2.2.22-new/azurelinuxagent/common/version.py	2018-02-28 17:24:49.320447232 -0800

-@@ -98,6 +98,9 @@ def get_distro():

+--- a/azurelinuxagent/common/version.py	2019-02-12 18:34:57.642398953 +0530

+@@ -100,6 +100,8 @@ def get_distro():

+ 

      if os.path.exists("/etc/euleros-release"):

          osinfo[0] = "euleros"

- 

 +    if os.path.exists("/etc/photon-release"):

 +        osinfo[0] = "photonos"

-+

+ 

      # The platform.py lib has issue with detecting BIG-IP linux distribution.

      # Merge the following patch provided by F5.

-     if os.path.exists("/shared/vadc"):

-diff -rupN WALinuxAgent-2.2.22/config/photonos/waagent.conf WALinuxAgent-2.2.22-new/config/photonos/waagent.conf

-+++ WALinuxAgent-2.2.22-new/config/photonos/waagent.conf	2018-02-28 17:24:49.320447232 -0800

-@@ -0,0 +1,81 @@

-+#

+--- a/config/photonos/waagent.conf	2019-02-12 18:42:31.402386821 +0530

+@@ -0,0 +1,80 @@

 +# Microsoft Azure Linux Agent Configuration

 +#

 +

@@ -209,9 +204,8 @@ diff -rupN WALinuxAgent-2.2.22/config/photonos/waagent.conf WALinuxAgent-2.2.22-

 +# handling until inVMArtifactsProfile.OnHold is false.

 +# Default is disabled

 +# EnableOverProvisioning=n

-diff -rupN WALinuxAgent-2.2.22/init/photonos/waagent.service WALinuxAgent-2.2.22-new/init/photonos/waagent.service

-+++ WALinuxAgent-2.2.22-new/init/photonos/waagent.service	2018-02-28 17:24:49.320447232 -0800

+--- a/init/photonos/waagent.service	2019-02-12 18:42:08.370387437 +0530

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

 +[Unit]

 +Description=Azure Linux Agent

@@ -229,9 +223,8 @@ diff -rupN WALinuxAgent-2.2.22/init/photonos/waagent.service WALinuxAgent-2.2.22

 +

 +[Install]

 +WantedBy=multi-user.target

-diff -rupN WALinuxAgent-2.2.22/setup.py WALinuxAgent-2.2.22-new/setup.py

-+++ WALinuxAgent-2.2.22-new/setup.py	2018-02-28 17:24:49.320447232 -0800

+--- a/setup.py	2019-02-12 18:40:46.066389638 +0530

 @@ -113,6 +113,12 @@ def get_data_files(name, version, fullna

                         src=["config/clearlinux/waagent.conf"])

          set_systemd_files(data_files, dest='/usr/lib/systemd/system',

new file mode 100644

@@ -0,0 +1,74 @@

+%{!?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())")}

+%define debug_package %{nil}

+

+Summary:        Distro - an OS platform information API

+Name:           python-distro

+Version:        1.4.0

+Release:        1%{?dist}

+License:        ASL

+Group:          Development/Languages/Python

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Url:            https://pypi.python.org/pypi/distro

+Source0:        https://files.pythonhosted.org/packages/ca/e3/78443d739d7efeea86cbbe0216511d29b2f5ca8dbf51a6f2898432738987/distro-%{version}.tar.gz

+%define sha1    distro=d72ac60844b2b472fc815441afe60fc1da728926

+

+BuildRequires:  python2

+BuildRequires:  python2-libs

+BuildRequires:  python3

+BuildRequires:  python3-libs

+BuildRequires:  python-setuptools

+BuildRequires:  python3-setuptools

+BuildRequires:  python3-xml

+%if %{with_check}

+BuildRequires:  python-pip

+%endif

+

+Requires:       python2

+Requires:       python2-libs

+BuildArch:      noarch

+

+%description

+Distro provides information about the OS distribution it runs on, such as a reliable machine-readable ID, or version information.

+

+%package -n     python3-distro

+Summary:        python-distro

+Requires:       python3

+Requires:       python3-libs

+

+%description -n python3-distro

+Python 3 version.

+

+%prep

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

+

+%build

+python2 setup.py build

+python3 setup.py build

+

+%install

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

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

+

+%check

+pip install tox

+tox

+

+%files

+%defattr(-,root,root,-)

+%{python2_sitelib}/*

+%doc CHANGELOG.md CONTRIBUTORS.md README.md

+%license LICENSE

+/usr/bin/*

+

+%files -n python3-distro

+%defattr(-,root,root,-)

+%{python3_sitelib}/*

+/usr/bin/*

+%doc CHANGELOG.md CONTRIBUTORS.md README.md

+%license LICENSE

+

+%changelog

+*   Tue Feb 12 2019 Tapas Kundu <tkundu@vmware.com> 1.4.0-1

+-   Initial packaging for Photon