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

 Summary:	Programs for generating Makefiles

 Name:		automake

-Version:	1.15

-Release:	4%{?dist}

+Version:	1.15.1

+Release:	1%{?dist}

 License:	GPLv2+

 URL:		http://www.gnu.org/software/automake/

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

 Distribution: 	Photon

-Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.gz

-%define sha1 automake=b5a840c7ec4321e78fdc9472e476263fa6614ca1

+Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz

+%define sha1 automake=45632d466c16ecf18d9c18dc4be883cde59acb59

 BuildRequires:	autoconf

 BuildArch:      noarch

@@ -42,6 +42,8 @@ make %{?_smp_mflags} check

 %{_defaultdocdir}/%{name}-%{version}/*

 %{_mandir}/*/*

 %changelog

+*	Tue Jan 02 2018 Alexey Makhalov <amakhalov@vmware.com> 1.15.1-1

+-	Version update

 *	Fri Aug 04 2017 Danut Moraru <dmoraru@vmware.com> 1.15-4

 -	Disable check that fails test case

 *	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.15-3

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

 Summary:	Apache Commons Daemon

 Name:		commons-daemon

-Version:	1.0.15

-Release:	12%{?dist}

+Version:	1.1.0

+Release:	1%{?dist}

 License:	Apache

 URL:		http://commons.apache.org/proper/commons-daemon

 Group:		Applications/System

 Vendor:		VMware, Inc.

 Distribution: 	Photon

-Source0:	http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.0.15-src.tar.gz

-%define sha1 commons-daemon=ca6a448d1d214f714e214b35809a2117568970e3

+Source0:	http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.1.0-src.tar.gz

+%define sha1 commons-daemon=5a64221b8020d32c02bf44a115f8a95016d3c76e

 BuildRequires: openjre8

 BuildRequires: openjdk8

 BuildRequires: apache-ant

@@ -29,8 +29,14 @@ rm -rf %{buildroot}

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

 ant dist

+%ifarch x86_64

 export CFLAGS=-m64

 export LDFLAGS=-m64

+%endif

+

+%ifarch aarch64

+sed -i 's/supported_os="aarch64"/supported_os="linux"/' src/native/unix/configure

+%endif

 CURDIR=`pwd`

@@ -56,6 +62,8 @@ chmod -R 755 $DIST_DIR

 %{_datadir}/java/*.jar

 %changelog

+*   Tue Dec 26 2017 Alexey Makhalov <amakhalov@vmware.com> 1.1.0-1

+-   Versio update to support aarch64

 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.15-12

 -   Remove BuildArch

 *   Tue Jun 20 2017 Divya Thaluru <dthaluru@vmware.com> 1.0.15-11

@@ -4,7 +4,7 @@

 Name:           gobject-introspection

 Summary:        Introspection system for GObject-based libraries

 Version:        1.52.1

-Release:        4%{?dist}

+Release:        5%{?dist}

 Group:          Development/Libraries

 License:        GPLv2+, LGPLv2+, MIT

 URL:            http://live.gnome.org/GObjectIntrospection

@@ -69,6 +69,7 @@ Libraries and headers for gobject-introspection.

 %setup -q

 %patch0 -p1

 rm -rf ../p3dir

+autoreconf -fiv

 cp -a . ../p3dir

 %build

@@ -135,6 +136,8 @@ make  %{?_smp_mflags} check

 %doc %{_mandir}/man1/*.gz

 %changelog

+*   Tue Jan 02 2018 Alexey Makhalov <amakhalov@vmware.com> 1.52.1-5

+-   Add autoreconf to support automake-1.15.1

 *   Mon Aug 28 2017 Kumar Kaushik <kaushikk@vmware.com> 1.52.1-4

 -   Disabling make check for Regress-1.0.gir test, bug#1635886

 *   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 1.52.1-3

new file mode 100644

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

+diff -Naur lightwave-1.3.1.7_orig/configure.ac lightwave-1.3.1.7/configure.ac

+--- lightwave-1.3.1.7_orig/configure.ac	2017-11-07 18:38:24.000000000 +0000

+@@ -21,7 +21,7 @@

+         PLATFORM_LIB_PREFIX=lib64

+         ;;

+     linux*:aarch64)

+-        PLATFORM_LIB_PREFIX=lib

++        PLATFORM_LIB_PREFIX=lib64

+         ;;

+     darwin*:x86_64)

+         PLATFORM_LIB_PREFIX=lib

+@@ -224,7 +224,7 @@

+     OPEN_SSL_DEFAULT_PATH=/opt/vmware/lib

+     ;;

+     linux*:aarch64)

+-    OPEN_SSL_DEFAULT_PATH=/opt/vmware/lib

++    OPEN_SSL_DEFAULT_PATH=/opt/vmware/lib64

+     ;;

+     *)

+     AC_ERROR("Unsupported operating system - ${host_os}:${host_cpu}")

+@@ -445,7 +445,7 @@

+     LIKEWISE_DEFAULT_PATH=$LW_BASE_PATH/lib

+     ;;

+     linux*:aarch64)

+-    LIKEWISE_DEFAULT_PATH=$LW_BASE_PATH/lib

++    LIKEWISE_DEFAULT_PATH=$LW_BASE_PATH/lib64

+     ;;

+     *)

+     AC_ERROR("Unsupported operating system - ${host_os}:${host_cpu}")

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

 Name:          lightwave

 Summary:       VMware Lightwave

 Version:       1.3.1.7

-Release:       1%{?dist}

+Release:       2%{?dist}

 License:       Apache 2.0

 Group:         Applications/System

 Vendor:        VMware, Inc.

 URL: 	       https://github.com/vmware/lightwave

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

 Patch0:        lightwave-gssapi-unix-creds-separation.patch

+Patch1:        lightwave-aarch64-support.patch

 %define sha1 lightwave=abe987b67aadab05040ac38c11474b8d93fe8644

 Distribution:  Photon

@@ -126,6 +127,7 @@ Lightwave POST service

 %prep

 %setup -qn lightwave-%{version}

 %patch0 -p1

+%patch1 -p1

 sed -i 's|/opt/vmware/bin/certool|/usr/bin/certool|' vmidentity/install/src/main/java/com/vmware/identity/configure/LinuxInstallerHelper.java

 sed -i 's/VMIDENTITY_LIB_DIR=\/opt\/vmware\/lib64/VMIDENTITY_LIB_DIR=\/usr\/jars/' vmidentity/websso/src/main/resources/sso-config.sh

 sed -i 's,/opt/vmware/bin/ic-join,/usr/bin/ic-join,' config/scripts/domainjoin.sh

@@ -1141,6 +1143,8 @@ fi

 # %doc ChangeLog README COPYING

 %changelog

+*   Tue Dec 26 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.1.7-2

+-   Aarch64 support

 *   Thu Nov 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.1.7-1

 -   update to lightwave 1.3.1.7 (release 1.3.1-7 in lightwave repo)

 *   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.1-5

deleted file mode 100644

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

-diff -Naur mesos-1.1.0.orig/src/linux/fs.cpp mesos-1.1.0/src/linux/fs.cpp

-+++ mesos-1.1.0/src/linux/fs.cpp	2017-03-24 23:17:15.332465310 -0700

-@@ -17,6 +17,7 @@

- #include <errno.h>

- #include <stdio.h>

- #include <string.h>

-+#include <sys/sysmacros.h>

- 

- #include <linux/limits.h>

- #include <linux/unistd.h>

-diff -Naur mesos-1.1.0.orig/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp mesos-1.1.0/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp

-+++ mesos-1.1.0/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp	2017-03-25 00:12:23.657869169 -0700

-@@ -15,6 +15,7 @@

- // limitations under the License.

- 

- #include <stdint.h>

-+#include <sys/sysmacros.h>

- 

- #include <algorithm>

- #include <list>

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

 Summary:        Mesos

 Name:           mesos

-Version:        1.2.2

+Version:        1.4.1

 Release:        1%{?dist}

 License:        Apache

 URL:            http://mesos.apache.org

@@ -10,8 +10,7 @@ Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz

-%define sha1    mesos=bbcec6f04bb629a16a5ea24a8cde3f3e9f75300e

-Patch0:         mesos-sysmacros.patch

+%define sha1    mesos=5a194b3ea8e1a6c30269e9e88c204ba7bfca07e5

 BuildRequires:  openjre8 >= 1.8.0.45

 BuildRequires:  openjdk8 >= 1.8.0.45

 BuildRequires:  curl-devel

@@ -51,21 +50,15 @@ Requires:   %{name} = %{version}

 %prep

 %setup -q

-%patch0 -p1

 %build

 sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.am

 sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.am

-sed -i "/xlocale.h/d" 3rdparty/stout/include/stout/jsonify.hpp

-./configure \

+%configure \

     CFLAGS="%{optflags} -Wno-deprecated-declarations"  \

     CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-strict-aliasing" \

-    --disable-silent-rules \

-    --prefix=%{_prefix} \

-    --bindir=%{_bindir} \

-    --libdir=%{_libdir} \

-    --sysconfdir=%{_sysconfdir}

+    --disable-silent-rules

 make %{?_smp_mflags}

 #%check

@@ -105,7 +98,9 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 %exclude %{_libdir}/debug/

 %changelog

-*   Tue Oct 11 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.2-1

+*   Tue Jan 02 2018 Alexey Makhalov <amakhalov@vmware.com> 1.4.1-1

+-   Version update. Aarch64 support

+*   Wed Oct 11 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.2-1

 -   Updated to version 1.2.2

 *   Mon Oct 02 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.2.0-7

 -   Use multiple cores to build mesos.

@@ -129,7 +124,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 -   BuildRequires curl-devel.

 *   Tue Dec 13 2016 Xiaolin Li <xiaolinl@vmware.com> 1.1.0-1

 -   Updated to version 1.1.0

-*   Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 0.28.2-3

+*   Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 0.28.2-3

 -   Use sqlite-{devel,libs}

 *   Mon Oct 03 2016 ChangLee <changlee@vmware.com> 0.28.2-2

 -   Modified check

@@ -3,16 +3,15 @@

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

 Summary:        PyInstaller bundles a Python application and all its dependencies into a single package.

 Name:           python-pyinstaller

-Version:        3.2.1

-Release:        2%{?dist}

-Url:            https://pypi.python.org/pypi/PyInstaller/3.2.1

+Version:        3.3.1

+Release:        1%{?dist}

+Url:            https://pypi.python.org/pypi/PyInstaller/3.3.1

 License:        GPLv2+

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Source0:        https://files.pythonhosted.org/packages/source/P/PyInstaller/PyInstaller-%{version}.tar.bz2

-%define sha1    PyInstaller=6e8bc52d325a5527402ad574f774ed64c70bf03f

-Patch0:         python2-unit-tests.patch

+Source0:        https://files.pythonhosted.org/packages/source/P/PyInstaller/PyInstaller-%{version}.tar.gz

+%define sha1    PyInstaller=578324d2dfb4edbfca34903dbde404c95a211663

 BuildRequires:  python2

 BuildRequires:  python2-libs

 BuildRequires:  python2-devel

@@ -58,9 +57,12 @@ Python 3 version.

 rm -rf ../p3dir

 cp -a . ../p3dir

-%patch0 -p1

 %build

+pushd bootloader

+python ./waf distclean all

+popd

+

 python2 setup.py build

 pushd ../p3dir

 python3 setup.py build

@@ -79,7 +81,6 @@ mv %{buildroot}/%{_bindir}/pyinstaller        %{buildroot}/%{_bindir}/pyinstalle

 popd

 python2 setup.py install --single-version-externally-managed -O1 --root=%{buildroot}

-

 %check

 # future is required for python2 make check

 pip2 install -U future

@@ -110,6 +111,9 @@ LANG=en_US.UTF-8 py.test2 tests/unit tests/functional \

 %{_bindir}/pyinstaller3

 %exclude %{python2_sitelib}/PyInstaller/bootloader/Darwin-64bit

 %exclude %{python2_sitelib}/PyInstaller/bootloader/Linux-32bit

+%ifarch aarch64

+%exclude %{python2_sitelib}/PyInstaller/bootloader/Linux-64bit

+%endif

 %exclude %{python2_sitelib}/PyInstaller/bootloader/Windows-32bit

 %exclude %{python2_sitelib}/PyInstaller/bootloader/Windows-64bit

@@ -119,10 +123,15 @@ LANG=en_US.UTF-8 py.test2 tests/unit tests/functional \

 %{python3_sitelib}/*

 %exclude %{python3_sitelib}/PyInstaller/bootloader/Darwin-64bit

 %exclude %{python3_sitelib}/PyInstaller/bootloader/Linux-32bit

+%ifarch aarch64

+%exclude %{python3_sitelib}/PyInstaller/bootloader/Linux-64bit

+%endif

 %exclude %{python3_sitelib}/PyInstaller/bootloader/Windows-32bit

 %exclude %{python3_sitelib}/PyInstaller/bootloader/Windows-64bit

 %changelog

+*   Tue Jan 02 2018 Alexey Makhalov <amakhalov@vmware.com> 3.3.1-1

+-   Version update. Build bootloader from sources

 *   Mon Sep 25 2017 Bo Gan <ganb@vmware.com> 3.2.1-2

 -   Fix make check issues.

 *   Tue Feb 14 2017 Xiaolin Li <xiaolinl@vmware.com> 3.2.1-1

deleted file mode 100644

@@ -1,27 +0,0 @@

-diff --git a/tests/unit/test_hookutils.py b/tests/unit/test_hookutils.py

-index a33f5e5..f8908e7

-+++ b/tests/unit/test_hookutils.py

-@@ -13,7 +13,7 @@ import pytest

- import shutil

- from os.path import join

- from threading import Thread

--from queue import Queue

-+from multiprocessing import Queue

- 

- from PyInstaller.utils.hooks import collect_data_files, collect_submodules, \

-   get_module_file_attribute, remove_prefix, remove_suffix, \

-

-diff --git a/tests/unit/test_loader.py b/tests/unit/test_loader.py 

-index 67ad04b..127d9ec

-+++ b/tests/unit/test_loader.py

-@@ -10,7 +10,7 @@

- 

- import pytest

- from threading import Thread

--from queue import Queue

-+from multiprocessing import Queue

- 

- from PyInstaller.loader.pyimod02_archive import ArchiveFile

- 

@@ -11,8 +11,6 @@

     "public_key":"<ssh-key-here>",

     "postinstallscripts": ["rpi3-custom-patch.sh"],

     "additionalfiles": [

-                            {"root/boot/grub2/arm64-efi": "/boot/grub2/arm64-efi"},

-                            {"root/boot/dtb-4.4.36-8": "/boot/dtb"},

                             {"photon-dev.repo": "/etc/yum.repos.d/photon-dev.repo"},

                             {"resizefs.sh": "/usr/local/bin/resizefs.sh"},

                             {"resizefs.service": "/lib/systemd/system/resizefs.service"}

@@ -243,8 +243,10 @@ class SPECS(object):

         #adding openjre8 version rpm macro

         if (platform.machine() == "x86_64"):

             spec = Specutils(constants.specPath + "/openjdk8/openjdk8.spec")

-            java8version = spec.getVersion()

-            constants.addMacro("JAVA8_VERSION",java8version)

+        else:

+            spec = Specutils(constants.specPath + "/openjdk8/openjdk8_aarch64.spec")

+        java8version = spec.getVersion()

+        constants.addMacro("JAVA8_VERSION",java8version)

         #adding kernelversion rpm macro

         spec = Specutils(constants.specPath + "/linux/linux.spec")

@@ -372,33 +372,12 @@ class constants(object):

             "mysql.spec",

             # irqbalance for arm64 ?

             "irqbalance.spec",

-            # no X rpms to build openjdk, skip all java packages

+            # openjdk8.spec is for x86_64 arch

             "openjdk8.spec",

-            "ant-contrib.spec",

-            "apache-ant.spec",

-            "apache-maven.spec",

-            "apache-tomcat.spec",

-            "cassandra.spec",

-            "commons-daemon.spec",

-            "jna.spec",

+            # dashboard failed to build libxslt during `npm install`

             "kubernetes-dashboard.spec",

-            "lightwave.spec",

-            "mesos.spec",

-            "protobuf.spec",

+            # test issue (java null pointer exception) before compilation

             "wavefront-proxy.spec",

-            "zookeeper.spec",

-            # requires lightwave

-            "pmd.spec",

-            # requires protobuf

-            "calico-felix.spec",

-            "lightstep-tracer-cpp.spec",

-            "protobuf-c.spec",

-            "runc.spec",

-            # requires cassandra

-            "python-cqlsh.spec",

-            # requires python-pyinstaller, but it has unresolved glibc deps

-            "calico-k8s-policy.spec",

-            "libcalico.spec",

             # pcstat requires patching for aarch64

             "pcstat.spec",

             # sysdig for aarch64 requires luajit, skip it and falco