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

 Summary:        NFS client utils

 Name:           nfs-utils

 Version:        2.1.1

-Release:        6%{?dist}

+Release:        7%{?dist}

 License:        GPLv2+

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

 Group:          Applications/Nfs-utils-client

@@ -21,7 +21,7 @@ BuildRequires:  libtirpc-devel

 BuildRequires:  python3-devel

 Requires:       libtirpc

 Requires:       rpcbind

-Requires:       (shadow or toybox)

+Requires:       shadow

 Requires:       python3-libs

 %description

@@ -80,6 +80,8 @@ make check

 /lib/systemd/system/*

 %changelog

+*   Tue Oct 10 2017 Alexey Makhalov <amakhalov@vmware.com> 2.1.1-7

+-   No direct toybox dependency, shadow depends on toybox

 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 2.1.1-6

 -   Requires shadow or toybox

 *   Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 2.1.1-5

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

 Summary:        Free version of the SSH connectivity tools

 Name:           openssh

 Version:        7.5p1

-Release:        7%{?dist}

+Release:        8%{?dist}

 License:        BSD

 URL:            https://www.openssh.com/

 Group:          System Environment/Security

@@ -38,7 +38,7 @@ This provides the ssh client utilities.

 %package server

 Summary: openssh server applications

 Requires:   Linux-PAM

-Requires:   (shadow or toybox)

+Requires:   shadow

 Requires:   ncurses-terminfo

 Requires:   openssh-clients = %{version}-%{release}

 Requires(post): /bin/chown

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

 %{_mandir}/man8/ssh-pkcs11-helper.8.gz

 %changelog

+*   Tue Oct 10 2017 Alexey Makhalov <amakhalov@vmware.com> 7.5p1-8

+-   No direct toybox dependency, shadow depends on toybox

 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 7.5p1-7

 -   Requires shadow or toybox

 *   Thu Sep 14 2017 Alexey Makhalov <amakhalov@vmware.com> 7.5p1-6

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

 Summary:        Programs for handling passwords in a secure way

 Name:           shadow

 Version:        4.2.1

-Release:        13%{?dist}

+Release:        14%{?dist}

 URL:            http://pkg-shadow.alioth.debian.org/

 License:        BSD

 Group:          Applications/System

@@ -19,11 +19,19 @@ BuildRequires:  cracklib-devel

 Requires:       cracklib

 BuildRequires:  Linux-PAM-devel

 Requires:       Linux-PAM

+Requires:       (%{name}-tools = %{version}-%{release} or toybox)

 %description

 The Shadow package contains programs for handling passwords

 in a secure way.

+%package tools

+Summary: Contains subset of tools which might be replaced by toybox

+Group:      Applications/System

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

+%description tools

+Contains subset of tools which might be replaced by toybox

+

 %package lang

 Summary: Additional language files for shadow

 Group:      Applications/System

@@ -110,7 +118,6 @@ make %{?_smp_mflags} check

 %config(noreplace) /etc/login.access

 %config(noreplace) /etc/default/useradd

 %config(noreplace) /etc/limits

-/bin/*

 /sbin/nologin

 %{_bindir}/*

 %{_sbindir}/*

@@ -137,10 +144,17 @@ make %{?_smp_mflags} check

 %exclude %{_mandir}/zh_TW

 %config(noreplace) %{_sysconfdir}/pam.d/*

+%files tools

+%defattr(-,root,root)

+/bin/*

+

 %files lang -f %{name}.lang

 %defattr(-,root,root)

 %changelog

+*   Tue Oct 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.2.1-14

+-   Added -tools subpackage

+-   Main package requires -tools or toybox

 *   Tue Aug 15 2017 Anish Swaminathan <anishs@vmware.com> 4.2.1-13

 -   Added fix for CVE-2017-12424, CVE-2016-6252

 *   Thu Apr 27 2017 Divya Thaluru <dthaluru@vmware.com> 4.2.1-12

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

 Summary:        Sudo

 Name:           sudo

 Version:        1.8.20p2

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        ISC

 URL:            https://www.sudo.ws/

 Group:          System Environment/Security

@@ -12,7 +12,7 @@ Source0:        http://www.sudo.ws/sudo/dist/%{name}-%{version}.tar.gz

 BuildRequires:  man-db

 BuildRequires:  Linux-PAM-devel

 Requires:       Linux-PAM

-Requires:       (shadow or toybox)

+Requires:       shadow

 %description

 The Sudo package allows a system administrator to give certain users (or groups of users) 

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

 %exclude  /etc/sudoers.dist

 %changelog

+*   Tue Oct 10 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-4

+-   No direct toybox dependency, shadow depends on toybox

 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-3

 -   Requires shadow or toybox

 *   Fri Jul 07 2017 Chang Lee <changlee@vmware.com> 1.8.20p2-2

@@ -79,6 +79,7 @@ class PackageBuilder(object):

             # TODO: self.logger might be None

             self.logger.error(e)

             outputMap[threadName]=False

+            raise e

     def checkIfPackageIsAlreadyBuilt(self):

         basePkg=SPECS.getData().getSpecName(self.package)

@@ -152,6 +153,8 @@ class PackageBuilder(object):

     def installPackage(self,pkgUtils,package,chrootID,destLogPath,listInstalledPackages):

         if package in listInstalledPackages:

             return

+        # mark it as installed -  to avoid cyclic recursion

+        listInstalledPackages.append(package)

         self.installDependentRunTimePackages(pkgUtils,package,chrootID,destLogPath,listInstalledPackages)

         noDeps=False

         if self.mapPackageToCycles.has_key(package):

@@ -161,7 +164,6 @@ class PackageBuilder(object):

         if package in constants.noDepsPackageList:

             noDeps=True

         pkgUtils.installRPM(package,chrootID,noDeps,destLogPath)

-        listInstalledPackages.append(package)

     def installDependentRunTimePackages(self,pkgUtils,package,chrootID,destLogPath,listInstalledPackages):

         listRunTimeDependentPackages=self.findRunTimeRequiredRPMPackages(package)

@@ -393,6 +393,9 @@ class SerializedSpecObjects(object):

         specName = self.getSpecName(inPkg)

         specObj = self.mapSerializableSpecObjects[specName]

         for depPkg in specObj.installRequiresPackages[inPkg]:

+            # ignore circular deps within single spec file

+            if (specObj.installRequiresPackages.has_key(depPkg) and inPkg in specObj.installRequiresPackages[depPkg] and self.getSpecName(depPkg) == specName):

+                continue

             if (allDeps.has_key(depPkg) and allDeps[depPkg] < level + 1):

                 allDeps[depPkg] = level + 1

                 parent[depPkg] = inPkg

@@ -8,7 +8,7 @@ class StringUtils(object):

     # aaa <= 3.1 ccc ddd

     def getStringInConditionalBrackets(self,inputstring):

         inputstring=inputstring.strip()

-        items = re.findall(r"([(][A-Za-z0-9 _\.\-<>=]+[)])",  inputstring)

+        items = re.findall(r"([(][A-Za-z0-9 %{?}_\.\-<>=]+[)])",  inputstring)

         for m in items:

             out = m[m.find("(")+1 : m.find(" or ")].strip()

             inputstring = inputstring.replace(m, out);