new file mode 100644

@@ -0,0 +1,63 @@

+%define debug_package %{nil}

+

+Summary:        CRI tools

+Name:           cri-tools

+Version:        1.11.1

+Release:        1%{?dist}

+License:        Apache License Version 2.0

+URL:            https://github.com/kubernetes-incubator/cri-tools/archive/%{name}-%{version}.tar.gz

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

+%define sha1    %{name}-%{version}.tar.gz=ba8064bcac65239a9c9e0e21c7d576c6b39f4089

+Group:          Development/Tools

+Vendor:         VMware, Inc.

+Distribution:   Photon

+BuildRequires:  go

+

+%description

+cri-tools aims to provide a series of debugging and validation tools for Kubelet CRI, which includes:

+crictl: CLI for kubelet CRI.

+critest: validation test suites for kubelet CRI.

+

+%prep

+%setup -qn %{name}-%{version}

+

+%build

+make %{?_smp_mflags}

+

+

+%install

+rm -rf %{buildroot}

+mkdir -p %{buildroot}%{_datadir}/%{name}

+mkdir -p %{buildroot}/usr/bin

+mkdir -p %{buildroot}/usr/lib/.build-id

+mkdir -p %{buildroot}/usr/share/doc/cri-tools

+mkdir -p %{buildroot}/usr/share/licenses/cri-tools

+mkdir -p %{buildroot}/man/man1

+

+make install DESTDIR=%{buildroot}

+cp /usr/local/bin/crictl %{buildroot}/usr/bin

+cp /usr/local/bin/critest %{buildroot}/usr/bin

+cp CHANGELOG.md %{buildroot}/usr/share/doc/cri-tools

+cp LICENSE %{buildroot}/usr/share/licenses/cri-tools

+cp CHANGELOG.md %{buildroot}/usr/share/doc/cri-tools

+cp CONTRIBUTING.md %{buildroot}/usr/share/doc/cri-tools

+cp OWNERS %{buildroot}/usr/share/doc/cri-tools

+cp README.md %{buildroot}/usr/share/doc/cri-tools

+cp code-of-conduct.md %{buildroot}/usr/share/doc/cri-tools

+cp docs/validation.md %{buildroot}/usr/share/doc/cri-tools

+cp docs/roadmap.md %{buildroot}/usr/share/doc/cri-tools

+

+%files

+%defattr(-,root,root)

+%{_datadir}/%{name}

+/usr/bin

+/usr/share/doc/*

+/usr/share/licenses/*

+/man/man1/

+

+%clean

+rm -rf %{buildroot}/*

+

+%changelog

+*    Thu Jul 26 2018 Tapas Kundu <tkundu@vmware.com> 1.11.1-1

+-    Initial build added for Photon.

new file mode 100644

@@ -0,0 +1,121 @@

+%define debug_package %{nil}

+

+Summary:        Elastic Serch

+Name:           elasticsearch

+Version:        6.3.0

+Release:        1%{?dist}

+License:        Apache License Version 2.0

+URL:            https://artifacts.elastic.co/downloads/elasticsearch/%{name}-%{version}.tar.gz

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

+%define sha1    %{name}-%{version}.tar.gz=3f356bf80bd31c0107622cf7213d0ee9f43536d8

+Source1:        cacerts

+%define sha1    cacerts=f584c7c1f48c552f39acfb5560a300a657d9f3bb

+Group:          Development/Daemons

+Vendor:         VMware, Inc.

+Distribution:   Photon

+BuildRequires:  openjdk10

+BuildRequires:  unzip

+BuildRequires:  curl

+BuildRequires:  which

+BuildRequires:  git

+BuildRequires:  make

+BuildRequires:  automake

+BuildRequires:  autoconf

+BuildRequires:  libtool

+BuildRequires:  tar

+BuildRequires:  wget

+BuildRequires:  patch

+BuildRequires:  texinfo

+Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd

+Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel

+

+%description

+Elasticsearch is a highly distributed RESTful search engine built for the cloud.

+

+%prep

+%setup -qn %{name}-%{version}

+

+%build

+export LANG="en_US.UTF-8"

+export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"

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

+export PATH=$JAVA_HOME/bin:$PATH

+export _JAVA_OPTIONS="-Xmx10g"

+cp %{SOURCE1} /usr/lib/jvm/OpenJDK-%{JAVA10_VERSION}/lib/security/

+./gradlew assemble

+

+%install

+rm -rf %{buildroot}

+mkdir -p %{buildroot}%{_datadir}/%{name}

+mkdir -p %{buildroot}/etc/%{name}

+mkdir -p %{buildroot}/usr/lib/sysctl.d/

+mkdir -p %{buildroot}/usr/lib/systemd/system/

+mkdir -p %{buildroot}/usr/lib/tmpfiles.d/

+mkdir -p %{buildroot}/etc/init.d/elasticsearch

+mkdir -p %{buildroot}/etc/sysconfig/elasticsearch

+mkdir -p %{buildroot}/var/lib/elasticsearch

+mkdir -p %{buildroot}/var/log/elasticsearch

+mkdir -p %{buildroot}/var/run/elasticsearch

+mkdir -p %{buildroot}%{_datadir}/%{name}/data

+

+tar -xvf distribution/archives/oss-tar/build/distributions/elasticsearch-oss-6.3.0-SNAPSHOT.tar.gz

+cp elasticsearch-6.3.0-SNAPSHOT/LICENSE.txt %{buildroot}%{_datadir}/%{name}/

+cp elasticsearch-6.3.0-SNAPSHOT/NOTICE.txt %{buildroot}%{_datadir}/%{name}/

+cp elasticsearch-6.3.0-SNAPSHOT/README.textile %{buildroot}%{_datadir}/%{name}/

+cp -r elasticsearch-6.3.0-SNAPSHOT/* %{buildroot}%{_datadir}/%{name}/

+cp distribution/packages/build/packaging/oss-rpm/systemd/sysctl/elasticsearch.conf %{buildroot}/usr/lib/sysctl.d/

+cp distribution/packages/build/packaging/oss-rpm/systemd/elasticsearch.service %{buildroot}/usr/lib/systemd/system/

+cp distribution/packages/build/packaging/oss-rpm/systemd/elasticsearch.conf %{buildroot}/usr/lib/tmpfiles.d/

+cp elasticsearch-6.3.0-SNAPSHOT/config/log4j2.properties %{buildroot}/etc/%{name}/

+cp elasticsearch-6.3.0-SNAPSHOT/config/jvm.options %{buildroot}/etc/%{name}/

+

+chmod 755 %{buildroot}%{_datadir}/%{name}/

+chmod 755 %{buildroot}/etc/%{name}/

+chmod 755 %{buildroot}/var/log/%{name}/

+chmod 755 %{buildroot}/var/lib/%{name}/

+chmod 755 %{buildroot}/var/run/%{name}/

+chmod 755 %{buildroot}%{_datadir}/%{name}/data

+

+%pre

+

+getent group elasticsearch >/dev/null || /usr/sbin/groupadd -r elasticsearch

+getent passwd elasticsearch >/dev/null || /usr/sbin/useradd --comment "ElasticSearch" --shell /bin/bash -M -r --groups elasticsearch --home /usr/share/elasticsearch elasticsearch

+

+

+%post

+%systemd_post elasticsearch.service

+

+%preun

+%systemd_preun elasticsearch.service

+

+%postun

+%systemd_postun_with_restart elasticsearch.service

+if [ $1 -eq 0 ] ; then

+    /usr/sbin/userdel elasticsearch

+    /usr/sbin/groupdel elasticsearch

+fi

+

+

+%check

+

+%clean

+rm -rf %{buildroot}/*

+

+%files

+%defattr(-,root,root)

+%attr(755,elasticsearch,elasticsearch) /var/log/elasticsearch

+%attr(755,elasticsearch,elasticsearch) /usr/share/elasticsearch/data

+%attr(755,elasticsearch,elasticsearch) /var/lib/elasticsearch

+%attr(755,elasticsearch,elasticsearch) /var/run/elasticsearch

+%attr(755,elasticsearch,elasticsearch) /usr/share/elasticsearch

+%attr(755,elasticsearch,elasticsearch) /usr/share/elasticsearch/logs

+%dir %{_datadir}/%{name}

+%{_datadir}/%{name}

+%attr(755,elasticsearch,elasticsearch) /etc/%{name}

+%attr(755,elasticsearch,elasticsearch) /usr/lib/systemd/system/elasticsearch.service

+%attr(755,elasticsearch,elasticsearch) /usr/lib/sysctl.d/elasticsearch.conf

+%attr(755,elasticsearch,elasticsearch) /usr/lib/tmpfiles.d/elasticsearch.conf

+

+%changelog

+*    Mon Jul 09 2018 Tapas Kundu <tkundu@vmware.com> 6.3.0-1

+-    Initial build added for Photon.

@@ -19,13 +19,31 @@ MongoDB (from "humongous") is a scalable, high-performance, open source, documen

 %setup -qn mongo-r%{version}

 %build

+%ifarch x86_64

 scons %{?_smp_mflags} MONGO_VERSION=%{version} \

     --disable-warnings-as-errors

+%endif

+

+%ifarch aarch64

+scons %{?_smp_mflags} MONGO_VERSION=%{version} CCFLAGS="-march=armv8-a+crc" \

+    --disable-warnings-as-errors

+%endif

+

+

 %install

+%ifarch x86_64

 scons %{?_smp_mflags} MONGO_VERSION=%{version} install \

     --prefix=%{buildroot}%{_prefix} \

     --disable-warnings-as-errors

+%endif

+

+%ifarch aarch64

+scons %{?_smp_mflags} MONGO_VERSION=%{version} CCFLAGS="-march=armv8-a+crc" install \

+    --prefix=%{buildroot}%{_prefix} \

+    --disable-warnings-as-errors

+%endif

+

 install -d %{buildroot}/var/log/%{name}

 install -d %{buildroot}/var/lib/mongo

 install -d -m 755 %{buildroot}%{_unitdir}

new file mode 100644

@@ -0,0 +1,135 @@

+--- a/src/newgidmap.c	2018-07-31 05:56:46.642785135 +0530

+@@ -46,32 +46,36 @@

+  */

+ const char *Prog;

+ 

+-static bool verify_range(struct passwd *pw, struct map_range *range)

++static bool verify_range(struct passwd *pw, struct map_range *range, bool *allow_setgroups)

+ {

+ 	/* An empty range is invalid */

+ 	if (range->count == 0)

+ 		return false;

+ 

+-	/* Test /etc/subgid */

+-	if (have_sub_gids(pw->pw_name, range->lower, range->count))

++	/* Test /etc/subgid. If the mapping is valid then we allow setgroups. */

++	if (have_sub_gids(pw->pw_name, range->lower, range->count)) {

++		*allow_setgroups = true;

+ 		return true;

++	}

+ 

+ 	/* Allow a process to map it's own gid */

+-	if ((range->count == 1) && (pw->pw_gid == range->lower))

++	if ((range->count == 1) && (pw->pw_gid == range->lower)) {

++		/* noop -- if setgroups is enabled already we won't disable it. */

+ 		return true;

++	}

+ 

+ 	return false;

+ }

+ 

+ static void verify_ranges(struct passwd *pw, int ranges,

+-	struct map_range *mappings)

++	struct map_range *mappings, bool *allow_setgroups)

+ {

+ 	struct map_range *mapping;

+ 	int idx;

+ 

+ 	mapping = mappings;

+ 	for (idx = 0; idx < ranges; idx++, mapping++) {

+-		if (!verify_range(pw, mapping)) {

++		if (!verify_range(pw, mapping, allow_setgroups)) {

+ 			fprintf(stderr, _( "%s: gid range [%lu-%lu) -> [%lu-%lu) not allowed\n"),

+ 				Prog,

+ 				mapping->upper,

+@@ -83,6 +87,70 @@ static void verify_ranges(struct passwd

+ 	}

+ }

+ 

++void write_setgroups(int proc_dir_fd, bool allow_setgroups)

++{

++	int setgroups_fd;

++	char *policy, policy_buffer[4096];

++

++	/*

++	 * Default is "deny", and any "allow" will out-rank a "deny". We don't

++	 * forcefully write an "allow" here because the process we are writing

++	 * mappings for may have already set themselves to "deny" (and "allow"

++	 * is the default anyway). So allow_setgroups == true is a noop.

++	 */

++	policy = "deny\n";

++	if (allow_setgroups)

++		return;

++

++	setgroups_fd = openat(proc_dir_fd, "setgroups", O_RDWR|O_CLOEXEC);

++	if (setgroups_fd < 0) {

++		/*

++		 * If it's an ENOENT then we are on too old a kernel for the setgroups

++		 * code to exist. Emit a warning and bail on this.

++		 */

++		if (ENOENT == errno) {

++			fprintf(stderr, _("%s: kernel doesn't support setgroups restrictions\n"), Prog);

++			goto out;

++		}

++		fprintf(stderr, _("%s: couldn't open process setgroups: %s\n"),

++			Prog,

++			strerror(errno));

++		exit(EXIT_FAILURE);

++	}

++

++	/*

++	 * Check whether the policy is already what we want. /proc/self/setgroups

++	 * is write-once, so attempting to write after it's already written to will

++	 * fail.

++	 */

++	if (read(setgroups_fd, policy_buffer, sizeof(policy_buffer)) < 0) {

++		fprintf(stderr, _("%s: failed to read setgroups: %s\n"),

++			Prog,

++			strerror(errno));

++		exit(EXIT_FAILURE);

++	}

++	if (!strncmp(policy_buffer, policy, strlen(policy)))

++		goto out;

++

++	/* Write the policy. */

++	if (lseek(setgroups_fd, 0, SEEK_SET) < 0) {

++		fprintf(stderr, _("%s: failed to seek setgroups: %s\n"),

++			Prog,

++			strerror(errno));

++		exit(EXIT_FAILURE);

++	}

++	if (dprintf(setgroups_fd, "%s", policy) < 0) {

++		fprintf(stderr, _("%s: failed to setgroups %s policy: %s\n"),

++			Prog,

++			policy,

++			strerror(errno));

++		exit(EXIT_FAILURE);

++	}

++

++out:

++	close(setgroups_fd);

++}

++

+ static void usage(void)

+ {

+ 	fprintf(stderr, _("usage: %s <pid> <gid> <lowergid> <count> [ <gid> <lowergid> <count> ] ... \n"), Prog);

+@@ -103,6 +171,7 @@ int main(int argc, char **argv)

+ 	struct stat st;

+ 	struct passwd *pw;

+ 	int written;

++	bool allow_setgroups = false;

+ 

+ 	Prog = Basename (argv[0]);

+ 

+@@ -174,8 +243,9 @@ int main(int argc, char **argv)

+ 	if (!mappings)

+ 		usage();

+ 

+-	verify_ranges(pw, ranges, mappings);

++	verify_ranges(pw, ranges, mappings, &allow_setgroups);

+ 

++	write_setgroups(proc_dir_fd, allow_setgroups);

+ 	write_mapping(proc_dir_fd, ranges, mappings, "gid_map");

+ 	sub_gid_close();

+ 

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

 Summary:        Programs for handling passwords in a secure way

 Name:           shadow

 Version:        4.2.1

-Release:        15%{?dist}

+Release:        16%{?dist}

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

 License:        BSD

 Group:          Applications/System

@@ -23,6 +23,7 @@ Source11:       system-session

 Patch0:         chkname-allowcase.patch

 Patch1:         shadow-4.2.1-CVE-2016-6252-fix.patch

 Patch2:         shadow-4.2.1-CVE-2017-12424.patch

+Patch3:         shadow-4.2.1-CVE-2018-7169.patch

 BuildRequires:  cracklib

 BuildRequires:  cracklib-devel

 Requires:       cracklib

@@ -53,6 +54,7 @@ These are the additional language files of shadow.

 %patch0 -p1

 %patch1 -p1

 %patch2 -p1

+%patch3 -p1

 sed -i 's/groups$(EXEEXT) //' src/Makefile.in

 find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;

 sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \

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

 %defattr(-,root,root)

 %changelog

+*   Mon Jul 30 2018 Tapas Kundu <tkundu@vmware.com> 4.2.1-16

+-   Added fix for CVE-2018-7169

 *   Fri Apr 20 2018 Alexey Makhalov <amakhalov@vmware.com> 4.2.1-15

 -   Move pam.d config file to here for better tracking.

 -   Add pam_loginuid module as optional in a session.

@@ -41,7 +41,7 @@ class PackageBuildDataGenerator(object):

         return list(self.__buildDependencyGraph.keys())

     def _createSortListForPkg(self, pkg):

-        runTimeDepPkgList = self.__runTimeDependencyGraph[pkg]

+        runTimeDepPkgList = list(set(self.__runTimeDependencyGraph[pkg]))

         runTimeDepPkgList.append(pkg)

         sortListForPkg = []

@@ -135,7 +135,7 @@ class PackageBuildDataGenerator(object):

             dependentRpmPackages = SPECS.getData().getBuildRequiresForPackage(basePackage)

             dependentPackages = set()

             for rpmPkg in dependentRpmPackages:

-                basePkg = SPECS.getData().getSpecName(rpmPkg)

+                basePkg = SPECS.getData().getSpecName(rpmPkg.package)

                 dependentPackages.add(basePkg)

             self.__buildDependencyGraph[basePackage] = dependentPackages

             nextPackagesToConstructGraph.update(dependentPackages)

@@ -143,10 +143,13 @@ class PackageBuildDataGenerator(object):

         if addRunTimeGraph:

             rpmPackages = SPECS.getData().getPackages(basePackage)

             dependentPackages = set()

+            dependentRpmPackagesNames= set()

             for rpmPkg in rpmPackages:

                 dependentRpmPackages = SPECS.getData().getRequiresAllForPackage(rpmPkg)

-                self.__runTimeDependencyGraph[rpmPkg] = copy.copy(dependentRpmPackages)

-                for pkg in dependentRpmPackages:

+                for pkgName in dependentRpmPackages:

+                    dependentRpmPackagesNames.add(pkgName.package)

+                self.__runTimeDependencyGraph[rpmPkg] = copy.copy(dependentRpmPackagesNames)

+                for pkg in dependentRpmPackagesNames:

                     dependentPackages.add(SPECS.getData().getSpecName(pkg))

             nextPackagesToConstructGraph.update(dependentPackages)

@@ -91,48 +91,14 @@ class PackageBuilderBase(object):

     def _findBuildTimeCheckRequiredPackages(self, index=0):

         return SPECS.getData().getCheckBuildRequiresForPackage(self.package, index)

-    def _findRunTimeRequiredRPMPackagesParseObj(self,rpmPackage):

-        listRequiredPackages=SPECS.getData().getRequiresParseObjForPackage(rpmPackage)

-        return listRequiredPackages

-

-    def _findBuildTimeRequiredPackagesParseObj(self, index):

-        listRequiredPackages=SPECS.getData().getBuildRequiresParseObjForPackage(self.package, index)

-        return listRequiredPackages

-

-    def _findBuildTimeCheckRequiredPackagesParseObj(self, index):

-        listRequiredPackages=SPECS.getData().getCheckBuildRequiresParseObjForPackage(self.package, index)

-        return listRequiredPackages

-

-    def _getProperVersion(self,package,parseSpecObj):

-        listOfVersionObjs=self.getSpecObj(package)

-        for num in listOfVersionObjs:

-                if parseSpecObj.compare == 'gte':

-                       if LooseVersion(num.version) >= LooseVersion(parseSpecObj.version):

-                                return num.version

-                elif parseSpecObj.compare == 'lte':

-                        if LooseVersion(num.version) <= LooseVersion(parseSpecObj.version):

-                                return num.version

-                elif parseSpecObj.compare == 'eq':

-                        if LooseVersion(num.version) == LooseVersion(parseSpecObj.version):

-                                return num.version

-                elif parseSpecObj.compare == 'lt':

-                        if LooseVersion(num.version) < LooseVersion(parseSpecObj.version):

-                                return num.version

-                elif parseSpecObj.compare == 'gt':

-                        if LooseVersion(num.version) > LooseVersion(parseSpecObj.version):

-                                return num.version

-        return "*"

-

-

     def _installPackage(self, pkgUtils, package,packageVersion, instanceID, destLogPath,

                         listInstalledPackages, listInstalledRPMs):

-        latestRPM = os.path.basename(

-            pkgUtils.findRPMFileForGivenPackage(package)).replace(".rpm", "")

-        if package in listInstalledPackages and latestRPM in listInstalledRPMs:

-            return

+        specificRPM = os.path.basename(pkgUtils.findRPMFileForGivenPackage(package,packageVersion)).replace(".rpm", "")

+        if package in listInstalledPackages:

+                return

         # mark it as installed -  to avoid cyclic recursion

         listInstalledPackages.append(package)

-        listInstalledRPMs.append(latestRPM)

+        listInstalledRPMs.append(specificRPM)

         self._installDependentRunTimePackages(pkgUtils, package, instanceID, destLogPath,

                                               listInstalledPackages, listInstalledRPMs)

         noDeps = False

@@ -148,7 +114,6 @@ class PackageBuilderBase(object):

     def _installDependentRunTimePackages(self, pkgUtils, package, instanceID, destLogPath,

                                          listInstalledPackages, listInstalledRPMs):

         listRunTimeDependentPackages = self._findRunTimeRequiredRPMPackages(package)

-        listRunTimeDependentPackagesParseObj=self._findRunTimeRequiredRPMPackagesParseObj(package)

         if listRunTimeDependentPackages:

             for pkg in listRunTimeDependentPackages:

                 if pkg in self.mapPackageToCycles:

@@ -157,40 +122,26 @@ class PackageBuilderBase(object):

                     pkgUtils.findRPMFileForGivenPackage(pkg)).replace(".rpm", "")

                 if pkg in listInstalledPackages and latestPkgRPM in listInstalledRPMs:

                     continue

-                flag = False

-                for objName in listRunTimeDependentPackagesParseObj:

-                    if objName.package == pkg:

-                        properVersion=self._getProperVersion(pkg,objName)

-                        self._installPackage(pkgUtils, pkg,properVersion, instanceID, destLogPath,listInstalledPackages, listInstalledRPMs)

-                        flag = True

-                        break;

-                if flag == False:

-                        self._installPackage(pkgUtils, pkg,"*", instanceID, destLogPath,listInstalledPackages, listInstalledRPMs)

+                self._installPackage(pkgUtils, pkg,"*", instanceID, destLogPath,listInstalledPackages, listInstalledRPMs)

     def _findDependentPackagesAndInstalledRPM(self, instanceID, index=0):

         listInstalledPackages, listInstalledRPMs = self._findInstalledPackages(instanceID)

         self.logger.info(listInstalledPackages)

         listDependentPackages = self._findBuildTimeRequiredPackages(index)

-        listDependentPackagesParseObj=self._findBuildTimeRequiredPackagesParseObj(index)

+        listTestPackages=[]

         if constants.rpmCheck and self.package in constants.testForceRPMS:

             listDependentPackages.extend(self._findBuildTimeCheckRequiredPackages(index))

-            listDependentPackagesParseObj.extend(self._findBuildTimeCheckRequiredPackagesParseObj(index))

             testPackages = (set(constants.listMakeCheckRPMPkgtoInstall) -

                             set(listInstalledPackages) -

                             set([self.package]))

-            listDependentPackages.extend(testPackages)

+            listTestPackages=list(set(testPackages))

             listDependentPackages = list(set(listDependentPackages))

-            listDependentPackagesParseObj=list(set(listDependentPackagesParseObj))

-        return listDependentPackages, listDependentPackagesParseObj,listInstalledPackages, listInstalledRPMs

+        return listDependentPackages, listTestPackages, listInstalledPackages, listInstalledRPMs

     @staticmethod

     def getNumOfVersions(package):

         return SPECS.getData().getNumberOfVersions(package)

-    @staticmethod

-    def getSpecObj(package):

-        return SPECS.getData().getSpecObj(package)

-

 class PackageBuilderContainer(PackageBuilderBase):

     def __init__(self, mapPackageToCycles, pkgBuildType):

         self.buildContainerImage = "photon_build_container:latest"

@@ -298,7 +249,7 @@ class PackageBuilderContainer(PackageBuilderBase):

                     constants.perPackageToolChain[self.package].get(platform.machine(), []),

                     self.package)

-            listDependentPackages,listDependentPackagesParseObj, listInstalledPackages, listInstalledRPMs = (

+            listDependentPackages, listTestPackages, listInstalledPackages, listInstalledRPMs = (

                 self._findDependentPackagesAndInstalledRPM(containerID, index))

             pkgUtils = PackageUtils(self.logName, self.logPath)

@@ -307,10 +258,13 @@ class PackageBuilderContainer(PackageBuilderBase):

                                  "Installing dependent packages..")

                 self.logger.info(listDependentPackages)

                 for pkg in listDependentPackages:

+                    properVersion=pkgUtils._getProperVersion(pkg.package,pkg)

+                    self._installPackage(pkgUtils, pkg.package,properVersion, containerID, destLogPath,listInstalledPackages, listInstalledRPMs)

+                for pkg in listTestPackages:

                     flag = False

-                    for objName in listDependentPackagesParseObj:

-                        if objName.package == pkg:

-                                properVersion=self._getProperVersion(pkg,objName)

+                    for lineContent in listDependentPackages:

+                        if lineContent.package == pkg:

+                                properVersion=pkgUtils._getProperVersion(pkg,lineContent)

                                 self._installPackage(pkgUtils, pkg,properVersion, containerID, destLogPath,listInstalledPackages, listInstalledRPMs)

                                 flag = True

                                 break;

@@ -385,7 +339,7 @@ class PackageBuilderChroot(PackageBuilderBase):

         chrootID = None

         try:

             chrootID = self._prepareBuildRoot()

-            listDependentPackages,listDependentPackagesParseObj, listInstalledPackages, listInstalledRPMs = (

+            listDependentPackages, listTestPackages, listInstalledPackages, listInstalledRPMs = (

                 self._findDependentPackagesAndInstalledRPM(chrootID, index))

             pkgUtils = PackageUtils(self.logName, self.logPath)

@@ -393,10 +347,13 @@ class PackageBuilderChroot(PackageBuilderBase):

             if listDependentPackages:

                 self.logger.info("Installing the build time dependent packages......")

                 for pkg in listDependentPackages:

+                    properVersion=pkgUtils._getProperVersion(pkg.package, pkg)

+                    self._installPackage(pkgUtils, pkg.package,properVersion, chrootID, self.logPath,listInstalledPackages, listInstalledRPMs)

+                for pkg in listTestPackages:

                     flag = False

-                    for objName in listDependentPackagesParseObj:

-                        if objName.package == pkg:

-                                properVersion=self._getProperVersion(pkg,objName)

+                    for lineContent in listDependentPackages:

+                        if lineContent.package == pkg:

+                                properVersion=pkgUtils._getProperVersion(pkg,lineContent)

                                 self._installPackage(pkgUtils, pkg,properVersion, chrootID, self.logPath,listInstalledPackages, listInstalledRPMs)

                                 flag = True

                                 break;

@@ -9,6 +9,7 @@ from Logger import Logger

 from constants import constants

 import PullSources

 from SpecData import SPECS

+from distutils.version import LooseVersion

 class PackageUtils(object):

@@ -431,6 +432,26 @@ class PackageUtils(object):

         rpmDestDir = rpmDir + "/" + arch

         return rpmDestDir

+    def _getProperVersion(self,package,parseSpecObj):

+        listOfVersionObjs=SPECS.getData().getSpecObj(package)

+        for num in listOfVersionObjs:

+                if parseSpecObj.compare == 'gte':

+                       if LooseVersion(num.version) >= LooseVersion(parseSpecObj.version):

+                                return num.version

+                elif parseSpecObj.compare == 'lte':

+                        if LooseVersion(num.version) <= LooseVersion(parseSpecObj.version):

+                                return num.version

+                elif parseSpecObj.compare == 'eq':

+                        if LooseVersion(num.version) == LooseVersion(parseSpecObj.version):

+                                return num.version

+                elif parseSpecObj.compare == 'lt':

+                        if LooseVersion(num.version) < LooseVersion(parseSpecObj.version):

+                                return num.version

+                elif parseSpecObj.compare == 'gt':

+                        if LooseVersion(num.version) > LooseVersion(parseSpecObj.version):

+                                return num.version

+        return "*"

+

     def _copyRPM(self, rpmFile, destDir):

         cmdUtils = CommandUtils()

         rpmName = os.path.basename(rpmFile)

@@ -105,7 +105,7 @@ class Scheduler(object):

         listRequiredPackages = []

         for pkg in listRequiredRPMPackages:

-            basePkg = SPECS.getData().getSpecName(pkg)

+            basePkg = SPECS.getData().getSpecName(pkg.package)

             if basePkg not in listRequiredPackages:

                 listRequiredPackages.append(basePkg)

@@ -205,7 +205,7 @@ class Scheduler(object):

         listRequiredPackages = []

         for pkg in listRequiredRPMPackages:

-            basePkg = SPECS.getData().getSpecName(pkg)

+            basePkg = SPECS.getData().getSpecName(pkg.package)

             if basePkg not in listRequiredPackages:

                 listRequiredPackages.append(basePkg)

@@ -21,9 +21,6 @@ class SpecObject(object):

         self.checkBuildRequirePackages = []

         self.installRequiresAllPackages = []

         self.installRequiresPackages = {}

-        self.specParseObjBuildRequirePackages = []

-        self.specParseObjInstallRequiresPackages=[]

-        self.specParseObjCheckBuildRequirePackages=[]

         self.specFile = ""

         self.listSources = []

         self.checksums = {}

@@ -50,9 +47,9 @@ class SpecObjectsUtils(object):

             specName = spec.getBasePackageName()

             specObj = SpecObject()

             specObj.name = specName

-            specObj.buildRequirePackages,specObj.specParseObjBuildRequirePackages = spec.getBuildRequiresAllPackages()

-            specObj.installRequiresAllPackages,specObj.specParseObjInstallRequiresPackages = spec.getRequiresAllPackages()

-            specObj.checkBuildRequirePackages,specObj.specParseObjCheckBuildRequirePackages = spec.getCheckBuildRequiresAllPackages()

+            specObj.buildRequirePackages = spec.getBuildRequiresAllPackages()

+            specObj.installRequiresAllPackages = spec.getRequiresAllPackages()

+            specObj.checkBuildRequirePackages = spec.getCheckBuildRequiresAllPackages()

             specObj.listPackages = spec.getPackageNames()

             specObj.specFile = specFile

             specObj.version = spec.getVersion()

@@ -110,22 +107,18 @@ class SpecObjectsUtils(object):

         specName = self.getSpecName(package)

         return self.mapSpecObjects[specName][index].checkBuildRequirePackages

-    def getBuildRequiresParseObjForPackage(self, package, index=0):

-        specName=self.getSpecName(package)

-        return self.mapSpecObjects[specName][index].specParseObjBuildRequirePackages

-

-    def getRequiresParseObjForPackage(self, package, index=0):

-        specName=self.getSpecName(package)

-        return self.mapSpecObjects[specName][index].specParseObjInstallRequiresPackages

-

-    def getCheckBuildRequiresParseObjForPackage(self, package, index=0):

-        specName=self.getSpecName(package)

-        return self.mapSpecObjects[specName][index].specParseObjCheckBuildRequirePackages

-

     def getSpecObj(self, package):

         specName=self.getSpecName(package)

         return self.mapSpecObjects[specName]

+    def getPkgNamesFromObj(self, objlist):

+        listPkgName=[]

+        listPkgNames=list(set(objlist))

+        for name in listPkgNames:

+                listPkgName.append(name.package)

+        listPkgName=list(set(listPkgName))

+        return listPkgName

+

     def getRelease(self, package, index=0):

         specName = self.getSpecName(package)

         return self.mapSpecObjects[specName][index].release

@@ -225,11 +218,11 @@ class SpecObjectsUtils(object):

             self.logger.info(" ")

             self.logger.info(" ")

             self.logger.info("Build require packages")

-            self.logger.info(specObj.buildRequirePackages)

+            self.logger.info(self.getPkgNamesFromObj(specObj.buildRequirePackages))

             self.logger.info(" ")

             self.logger.info(" ")

             self.logger.info("install require packages")

-            self.logger.info(specObj.installRequiresAllPackages)

+            self.logger.info(self.getPkgNamesFromObj(specObj.installRequiresAllPackages))

             self.logger.info(" ")

             self.logger.info(specObj.installRequiresPackages)

             self.logger.info("security_hardening: " + specObj.securityHardening)

@@ -265,6 +258,19 @@ class SPECS(object):

         java8version = spec.getVersion()

         constants.addMacro("JAVA8_VERSION", java8version)

+        # adding openjre9 version rpm macro

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

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

+            java9version = spec.getVersion()

+            constants.addMacro("JAVA9_VERSION", java9version)

+

+

+        # adding openjre10 version rpm macro

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

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

+            java10version = spec.getVersion()

+            constants.addMacro("JAVA10_VERSION", java10version)

+

         # adding kernelversion rpm macro

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

         kernelversion = spec.getVersion()

@@ -92,52 +92,39 @@ class Specutils(object):

     def getRequiresAllPackages(self):

         dependentPackages = []

-        specParseObjDependentPackages=[]

         for pkg in self.spec.packages.values():

             for dpkg in pkg.requires:

-                dependentPackages.append(dpkg.package)

-                specParseObjDependentPackages.append(dpkg)

-        dependentPackages = list(set(dependentPackages))

-        specParseObjDependentPackages = list(set(specParseObjDependentPackages))

-        specParseObjDependentPackagesTemp = specParseObjDependentPackages[:]

+                dependentPackages.append(dpkg)

+        listDependentPackages = list(set(dependentPackages))

         packageNames = self.getPackageNames()

         for pkgName in packageNames:

-            if pkgName in dependentPackages:

-                dependentPackages.remove(pkgName)

-            for objName in specParseObjDependentPackagesTemp:

+            for objName in listDependentPackages:

                 if objName.package == pkgName:

-                        specParseObjDependentPackages.remove(objName)

-        return dependentPackages,specParseObjDependentPackages

+                        dependentPackages.remove(objName)

+        dependentPackages = list(set(dependentPackages))

+        return dependentPackages

     def getBuildRequiresAllPackages(self):

         dependentPackages = []

-        specParseObjDependentPackages=[]

         for pkg in self.spec.packages.values():

             for dpkg in pkg.buildrequires:

-                dependentPackages.append(dpkg.package)

-                specParseObjDependentPackages.append(dpkg)

-        dependentPackages = list(set(dependentPackages))

-        specParseObjDependentPackages = list(set(specParseObjDependentPackages))

-        specParseObjDependentPackagesTemp = specParseObjDependentPackages[:]

+                dependentPackages.append(dpkg)

+        listDependentPackages = list(set(dependentPackages))

         packageNames = self.getPackageNames()

         for pkgName in packageNames:

-            if pkgName in dependentPackages:

-                dependentPackages.remove(pkgName)

-            for objName in specParseObjDependentPackagesTemp:

+            for objName in listDependentPackages:

                 if objName.package == pkgName:

-                        specParseObjDependentPackages.remove(objName)

-        return dependentPackages,specParseObjDependentPackages

+                        dependentPackages.remove(objName)

+        dependentPackages = list(set(dependentPackages))

+        return dependentPackages

     def getCheckBuildRequiresAllPackages(self):

         dependentPackages = []

-        specParseObjDependentPackages=[]

         for pkg in self.spec.packages.values():

             for dpkg in pkg.checkbuildrequires:

-                dependentPackages.append(dpkg.package)

-                specParseObjDependentPackages.append(dpkg)

+                dependentPackages.append(dpkg)

         dependentPackages = list(set(dependentPackages))

-        specParseObjDependentPackages = list(set(specParseObjDependentPackages))

-        return dependentPackages,specParseObjDependentPackages

+        return dependentPackages

     def getRequires(self, pkgName):

         dependentPackages = []

@@ -196,8 +183,8 @@ def main():

     print("requires {}".format(spec.getRequires('libtool')))

     print("provides {}".format(spec.getProvides('libtool')))

-    print("all-requires {}".format(spec.getRequiresAllPackages()))

-    print("all-build-requires {}".format(spec.getBuildRequiresAllPackages()))

+    print("all-requires {}".format(spec.getPkgNamesFromObj(spec.getRequiresAllPackages())))

+    print("all-build-requires {}".format(spec.getPkgNamesFromObj(spec.getBuildRequiresAllPackages())))

 if __name__ == '__main__':

     main()

@@ -7,6 +7,7 @@ from ChrootUtils import ChrootUtils

 from Logger import Logger

 from PackageUtils import PackageUtils

 from constants import constants

+from SpecData import SPECS

 class ToolChainUtils(object):

@@ -112,7 +113,13 @@ class ToolChainUtils(object):

             raise e

         return pkgCount

-    def installToolChainRPMS(self, chrootID, packageName, logPath=None):

+    def getListDependentPackageLineContent(self, index):

+        listBuildRequiresPkgLineContent=SPECS.getData().getBuildRequiresForPackage(self.package, index)

+        listBuildRequiresPkgLineContent.extend(SPECS.getData().getCheckBuildRequiresForPackage(self.package, index))

+        listBuildRequiresPkgLineContent=list(set(listBuildRequiresPkgLineContent))

+        return listBuildRequiresPkgLineContent

+

+    def installToolChainRPMS(self, chrootID, packageName, logPath=None,index=0):

         if logPath is None:

             logPath = self.logPath

         cmdUtils = CommandUtils()

@@ -120,16 +127,22 @@ class ToolChainUtils(object):

         self.logger.info("Installing Tool Chain RPMS.......")

         rpmFiles = ""

         packages = ""

+        self.package=packageName

+        listBuildRequiresPackageLineContent = self.getListDependentPackageLineContent(index)

         for package in constants.listToolChainRPMsToInstall:

             pkgUtils = PackageUtils(self.logName, self.logPath)

             rpmFile = None

+            version = "*"

+            for depPkg in listBuildRequiresPackageLineContent:

+                if depPkg.package == package:

+                        version=pkgUtils._getProperVersion(package,depPkg)

             if constants.rpmCheck:

-                rpmFile = pkgUtils.findRPMFileForGivenPackage(package)

+                rpmFile = pkgUtils.findRPMFileForGivenPackage(package, version)

             else:

                 if (packageName not in constants.listToolChainRPMsToInstall or

                         constants.listToolChainRPMsToInstall.index(packageName) >

                         constants.listToolChainRPMsToInstall.index(package)):

-                    rpmFile = pkgUtils.findRPMFileForGivenPackage(package)

+                    rpmFile = pkgUtils.findRPMFileForGivenPackage(package, version)

             if rpmFile is None:

                 # sqlite-autoconf package was renamed, but it still published as sqlite-autoconf

                 if (package == "sqlite") and (platform.machine() == "x86_64"):