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

 Summary:	Bourne-Again SHell

 Name:		bash

 Version:	4.4

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPLv3

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

 Group:		System Environment/Base

@@ -15,6 +15,10 @@ Provides:	/bin/sh

 Provides:	/bin/bash

 BuildRequires:  readline

 Requires:       readline

+Requires(post):    grep

+Requires(post):    /bin/cp

+Requires(postun):  grep

+Requires(postun):  /bin/mv

 %description

 The package contains the Bourne-Again SHell

@@ -292,6 +296,8 @@ fi

 %defattr(-,root,root)

 %changelog

+*   Sun Jun 4 2017 Bo Gan <ganb@vmware.com> 4.4-3

+-   Fix dependency

 *   Thu Feb 2 2017 Divya Thaluru <dthaluru@vmware.com> 4.4-2

 -   Modified bash entry in /etc/shells

 *   Fri Jan 13 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.4-1

@@ -5,7 +5,7 @@

 Summary:        A password strength-checking library.

 Name:           cracklib

 Version:        2.9.6

-Release:        6%{?dist}

+Release:        7%{?dist}

 Group:          System Environment/Libraries

 Source:         cracklib-%{version}.tar.gz

 %define sha1    cracklib-%{version}=9199e7b8830717565a844430653f5a90a04fcd65

@@ -16,6 +16,9 @@ URL:            http://sourceforge.net/projects/cracklib/

 License:        GPL

 Vendor:         VMware, Inc.

 Distribution:   Photon

+Requires:         /bin/ln

+Requires(post):   /bin/ln

+Requires(postun): /bin/rm

 %description

 CrackLib tests passwords to determine whether they match certain

@@ -206,6 +209,8 @@ rm -f %{_datadir}/cracklib/pw_dict.pwi

 %{_datadir}/locale/*

 %changelog

+*   Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 2.9.6-7

+-   Fix script dependency

 *   Thu May 18 2017 Xiaolin Li <xiaolinl@vmware.com> 2.9.6-6

 -   Move python2 requires to python subpackage and added python3.

 *   Thu Apr 13 2017 Bo Gan <ganb@vmware.com> 2.9.6-5

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

 Summary:	gptfdisk-1.0.1

 Name:		gptfdisk

 Version:	1.0.1

-Release:	3%{?dist}

+Release:	4%{?dist}

 License:	GPLv2+

 URL:		http://sourceforge.net/projects/gptfdisk/

 Group:		System Environment/Filesystem and Disk management

@@ -14,6 +14,7 @@ Requires: 	popt >= 1.16

 BuildRequires:	popt-devel

 BuildRequires:	ncurses-devel

 Requires:	ncurses

+Requires:	libstdc++

 %description

 The gptfdisk package is a set of programs for creation and maintenance of GUID Partition 

 Table (GPT) disk drives. A GPT partitioned disk is required for drives greater than 2 TB 

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

 /sbin/*

 %{_mandir}/man8/*

 %changelog

+*	Mon Jun 05 2017 Bo Gan <ganb@vmware.com> 1.0.1-4

+-	Fix dependency

 *       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 1.0.1-3

 -       Modified %check

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.1-2

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

 Summary:	Libraries for terminal handling of character screens

 Name:		ncurses

 Version:	6.0

-Release:	7%{?dist}

+Release:	8%{?dist}

 License:	MIT

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

 Group:		Applications/System

@@ -9,11 +9,19 @@ Vendor:		VMware, Inc.

 Distribution: 	Photon

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

 %define sha1 ncurses=acd606135a5124905da770803c05f1f20dd3b21c

-Provides:       libncurses.so.6()(64bit)

+Requires:	ncurses-libs = %{version}-%{release}

 %description

 The Ncurses package contains libraries for terminal-independent

 handling of character screens.

+%package libs

+Summary: Ncurses Libraries

+Group: System Environment/Libraries

+Provides:       libncurses.so.6()(64bit)

+

+%description libs

+This package contains ncurses libraries

+

 %package compat

 Summary: Ncurses compatibility libraries

 Group: System Environment/Libraries

@@ -98,8 +106,8 @@ cd test

 ./configure

 make

-%post	-p /sbin/ldconfig

-%postun	-p /sbin/ldconfig

+%post libs -p /sbin/ldconfig

+%postun	libs -p /sbin/ldconfig

 %post compat -p /sbin/ldconfig

 %postun compat -p /sbin/ldconfig

 %files

@@ -115,13 +123,15 @@ make

 %{_bindir}/tput

 %{_bindir}/infotocap

 %{_bindir}/toe

-%{_libdir}/lib*.so.6*

-%{_datadir}/tabset/*

 %{_mandir}/man7/*

 %{_mandir}/man1/*

 %{_mandir}/man5/*

+

+%files libs

 %{_datadir}/terminfo/l/linux

+%{_datadir}/tabset/*

 %{_libdir}/terminfo

+%{_libdir}/lib*.so.6*

 %files compat

 %{_libdir}/lib*.so.5*

@@ -170,6 +180,8 @@ make

 %exclude %{_datadir}/terminfo/l/linux

 %changelog

+*   Mon Jun 05 2017 Bo Gan <ganb@vmware.com> 6.0-8

+-   Fix bash dependency

 *   Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 6.0-7

 -   Fix symlink

 *   Wed Mar 29 2017 Alexey Makhalov <amakhalov@vmware.com> 6.0-6

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

 Summary:        Usermode tools for VmWare virts

 Name:           open-vm-tools

 Version:        10.1.5

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        LGPLv2+

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

 Group:          Applications/System

@@ -38,6 +38,7 @@ Requires:       glib

 Requires:       xml-security-c

 Requires:       openssl

 Requires:       systemd

+Requires:	libstdc++

 %description

 VmWare virtualization user mode tools

 %prep

@@ -107,6 +108,8 @@ fi

 %changelog

+*	Mon Jun 05 2017 Bo Gan <ganb@vmware.com> 10.1.5-5

+-	Fix dependency

 *       Thu Apr 20 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-4

 -       Timezone customization, PR # 1684889

 *       Fri Apr 07 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-3

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

 Summary:        A high-level scripting language

 Name:           python2

 Version:        2.7.13

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:        PSF

 URL:            http://www.python.org/

 Group:          System Environment/Programming

@@ -44,6 +44,7 @@ Requires:       expat >= 2.1.0

 Requires:       libffi >= 3.0.13

 Requires:       ncurses

 Requires:       coreutils

+Requires:       gdbm

 # Needed for ctypes, to load libraries, worked around for Live CDs size

 # Requires: binutils

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

 %exclude %{_bindir}/idle*

 %changelog

+*   Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 2.7.13-6

+-   Fix dependency for libs

 *   Tue May 16 2017 Kumar Kaushik <kaushikk@vmware.com> 2.7.13-5

 -   Fixing python issue 29188, backport random.c from 3.5 to 2.7.

 *   Fri Apr 28 2017 Harish Udaiya <hudaiyakumar@vmware.com> 2.7.13-4

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

 Summary:	Command-line editing and history capabilities

 Name:		readline

 Version:	7.0

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GPLv3+

 URL:		http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html

 Group:		Applications/System

@@ -10,7 +10,7 @@ Distribution: 	Photon

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

 %define sha1 readline=d9095fa14a812495052357e1d678b3f2ac635463

 BuildRequires:	ncurses-devel

-Requires:	ncurses

+Requires:	ncurses-libs

 %description

 The Readline package is a set of libraries that offers command-line

 editing and history capabilities.

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

 %{_mandir}/man3/history.3.gz

 %{_mandir}/man3/readline.3.gz

 %changelog

+*       Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 7.0-2

+-       Fix dependency

 *       Fri Jan 13 2017 Dheeraj Shetty <dheerajs@vmware.com> 7.0-1

 -       Updated to version 7.0

 *       Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 6.3-6

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

 Summary:        Package manager

 Name:           rpm

 Version:        4.13.0.1

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv2+

 URL:            http://rpm.org

 Group:          Applications/System

@@ -20,6 +20,7 @@ Patch1:         find-debuginfo-do-not-generate-dir-entries.patch

 Requires:       bash

 Requires:       libdb

 Requires:       rpm-libs = %{version}-%{release}

+Requires:       libarchive

 BuildRequires:  libarchive-devel

 BuildRequires:  libdb-devel

 BuildRequires:  popt-devel

@@ -259,6 +260,8 @@ rm -rf %{buildroot}

 %{python3_sitelib}/*

 %changelog

+*   Mon Jun 05 2017 Bo Gan <ganb@vmware.com> 4.13.0.1-3

+-   Fix Dependency

 *   Thu May 18 2017 Xiaolin Li <xiaolinl@vmware.com> 4.13.0.1-2

 -   Remove python2 from requires of rpm-devel subpackages.

 *   Wed May 10 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.13.0.1-1

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

 Summary:	C++ xml parser.

 Name:		xerces-c

 Version:	3.1.4

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	Apache License

 URL:		http://xerces.apache.org

 Group:		Applications/System

@@ -9,14 +9,18 @@ Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	http://mirrors.advancedhosters.com/apache//xerces/c/3/sources/%{name}-%{version}.tar.xz

 %define sha1 xerces-c=df52c67ad958460d4357b9305b49fda6876f6975

+Requires:	libstdc++

 %description

 Xerces-C++ is a validating XML parser written in a portable subset of C++

+

 %package	devel

 Summary:	XML library headers

 Group:         	Development/Libraries

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

+

 %description	devel

 This package contains development headers and static library for xml parser.

+

 %prep

 %setup -q

 %build

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

 %{_libdir}/*.la

 %changelog

+*	Mon Jun 05 2017 Bo Gan <ganb@vmware.com> 3.1.4-2

+-	Fix dependency

 *	Wed Mar 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.1.4-1

 -	Upgrade to latest version to handle CVE-2016-2099

 *       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 3.1.3-3

@@ -9,7 +9,7 @@

                 "open-vm-tools",

                 "docker","bridge-utils",

                 "cloud-init",

-                "krb5", "which", "tzdata", "motd"]

+                "krb5", "which", "tzdata", "motd", "gdbm"]

 }

@@ -131,7 +131,6 @@ class Installer(object):

                         retval = process.poll()

                         if retval is not None:

                             break

-                    modules.commons.log(modules.commons.LOG_INFO, "[tdnf] {0}".format(output))

                     if state == 0:

                         if output == 'Installing:\n':

                             state = 1

@@ -149,28 +148,31 @@ class Installer(object):

                             self.progress_bar.update_message('Preparing ...')

                             state = 3

                     elif state == 3:

+                        self.progress_bar.update_message(output)

                         if output == 'Running transaction\n':

                             state = 4

                     else:

+                        modules.commons.log(modules.commons.LOG_INFO, "[tdnf] {0}".format(output))

                         prefix = 'Installing/Updating: '

                         if output.startswith(prefix):

                             package = output[len(prefix):].rstrip('\n')

                             self.progress_bar.increment(packages_to_install[package])

                         self.progress_bar.update_message(output)

-                            #packages_to_install[package]))

                 # 0 : succeed; 137 : package already installed; 65 : package not found in repo.

                 if retval != 0 and retval != 137:

                     modules.commons.log(modules.commons.LOG_ERROR, "Failed to install some packages, refer to {0}".format(modules.commons.TDNF_LOG_FILE_NAME))

                     self.exit_gracefully(None, None)

         else:

         #install packages

+            rpms = []

             for rpm in self.rpms_tobeinstalled:

                 # We already installed the filesystem in the preparation

                 if rpm['package'] == 'filesystem':

                     continue

-                return_value = self.install_package(rpm['filename'])

-                if return_value != 0:

-                    self.exit_gracefully(None, None)

+                rpms.append(rpm['filename'])

+            return_value = self.install_package(rpms)

+            if return_value != 0:

+                self.exit_gracefully(None, None)

         if self.iso_installer:

@@ -289,6 +291,8 @@ class Installer(object):

     def bind_repo_dir(self):

         rpm_cache_dir = self.photon_root + '/cache/tdnf/photon-iso/rpms'

+        if self.rpm_path.startswith("https://") or self.rpm_path.startswith("http://"):

+            return

         if subprocess.call(['mkdir', '-p', rpm_cache_dir]) != 0 or subprocess.call(['mount', '--bind', self.rpm_path, rpm_cache_dir]) != 0:

             modules.commons.log(modules.commons.LOG_ERROR, "Fail to bind cache rpms")

             self.exit_gracefully(None, None)

@@ -379,20 +383,24 @@ class Installer(object):

             retval = process.wait()

             # remove the tdnf cache directory and the swapfile.

             process = subprocess.Popen(['rm', '-rf', os.path.join(self.photon_root, "cache")], stdout=self.output)

+            retval = process.wait()

-    def install_package(self,  package_name):

-        rpm_params = ''

+    def install_package(self,  rpm_file_names):

-        os.environ["RPMROOT"] = self.rpm_path

-        rpm_params = rpm_params + ' --force '

-        rpm_params = rpm_params + ' --root ' + self.photon_root

-        rpm_params = rpm_params + ' --dbpath /var/lib/rpm '

+        rpms = set(rpm_file_names)

+        rpm_paths = []

+        for root, dirs, files in os.walk(self.rpm_path):

+            for f in files:

+                if f in rpms:

+                    rpm_paths.append(os.path.join(root, f))

-        if ('type' in self.install_config and (self.install_config['type'] in ['micro', 'minimal'])) or self.install_config['iso_system']:

-            rpm_params = rpm_params + ' --excludedocs '

+        rpm_params = ['--root', self.photon_root, '--dbpath', '/var/lib/rpm']

-        process = subprocess.Popen([self.install_package_command, '-w', self.photon_root, package_name, rpm_params],  stdout=self.output)

+        if ('type' in self.install_config and (self.install_config['type'] in ['micro', 'minimal'])) or self.install_config['iso_system']:

+            rpm_params.append('--excludedocs')

+        modules.commons.log(modules.commons.LOG_INFO, "installing packages {0}, with params {1}".format(rpm_paths, rpm_params))

+        process = subprocess.Popen(['rpm', '-Uvh'] + rpm_params + rpm_paths, stderr=subprocess.STDOUT)

         return process.wait()

     def execute_modules(self, phase):

@@ -43,7 +43,7 @@ EOF

 grub_mbr_install()

 {

-    $grubInstallCmd --force --boot-directory=$BUILDROOT/boot "$HDD"

+    $grubInstallCmd --target=i386-pc --force --boot-directory=$BUILDROOT/boot "$HDD"

 }

 set -o errexit        # exit if error...insurance ;)

@@ -221,6 +221,9 @@ class SpecParser(object):

             while i < totalContents:

                 dpkg = dependentPackageData()

                 compare=None

+                if listContents[i].startswith("/"):

+                    i=i+1

+                    continue

                 if i+2 < len(listContents):

                     if listContents[i+1] == ">=":

                         compare="gte"

@@ -247,6 +247,9 @@ class SpecParser(object):

             while i < totalContents:

                 dpkg = dependentPackageData()

                 compare=None

+                if listContents[i].startswith("/"):

+                    i=i+1

+                    continue

                 if i+2 < len(listContents):

                     if listContents[i+1] == ">=":

                         compare="gte"

@@ -127,12 +127,13 @@ class constants(object):

         "gcc",

         "pkg-config",

         "ncurses",

+        "ncurses-libs",

+        "ncurses-devel",

         "bash",

         "bzip2",

         "bzip2-libs",

         "bzip2-devel",

         "sed",

-        "ncurses-devel",

         "procps-ng",

         "coreutils",

         "m4",

@@ -248,6 +249,7 @@ class constants(object):

         "glibc-tools",

         "bzip2-libs",

         "expat-libs",

+        "ncurses-libs",

         "util-linux-libs",

         "nss-libs",

         "xz-libs",