@@ -63,6 +63,11 @@ else

 PHOTON_RPMCHECK_FLAGS :=

 endif

+# KAT build for FIPS certification

+ifdef KAT_BUILD

+PHOTON_KAT_BUILD_FLAGS := -F $(KAT_BUILD)

+endif

+

 ifeq ($(BUILDDEPS),true)

 PUBLISH_BUILD_DEPENDENCIES := -bd True

 else

@@ -245,6 +250,7 @@ packages: check-docker-py check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(

                 -w $(PHOTON_STAGE)/pkg_info.json \

                 -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

                 $(PHOTON_RPMCHECK_FLAGS) \

+		$(PHOTON_KAT_BUILD_FLAGS) \

 		$(PUBLISH_BUILD_DEPENDENCIES) \

 		$(PACKAGE_WEIGHTS_PATH) \

                 -t ${THREADS}

@@ -289,6 +295,7 @@ updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_P

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

                 -k $(PHOTON_INPUT_RPMS_DIR) \

+		$(PHOTON_KAT_BUILD_FLAGS) \

                 $(PHOTON_RPMCHECK_FLAGS) \

 		$(PUBLISH_BUILD_DEPENDENCIES) \

 		$(PACKAGE_WEIGHTS_PATH) \

@@ -604,6 +611,7 @@ check: packages

                               -v $(PHOTON_RELEASE_VERSION) \

                               -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

                               $(PHOTON_RPMCHECK_FLAGS) \

+				$(PHOTON_KAT_BUILD_FLAGS) \

                               -l $(PHOTON_LOGS_DIR)

 generate-yaml-files: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES)

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat01/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -15591,7 +15591,7 @@

+ 			  "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"

+ 			  "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",

+ 		.ilen	= 64,

+-		.result	= "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"

++		.result	= "\x23\x32\x23\x32\x43\xbc\x63\x3d"

+ 			  "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"

+ 			  "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"

+ 			  "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat02/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -15475,7 +15475,7 @@

+ 			  "\x09\x79\xA0\x43\x5C\x0D\x08\x58"

+ 			  "\x17\xBB\xC0\x6B\x62\x3F\x56\xE9",

+ 		.ilen	= 496,

+-		.result	= "\x50\xB9\x22\xAE\x17\x80\x0C\x75"

++		.result	= "\x23\x32\x23\x32\x17\x80\x0C\x75"

+ 			  "\xDE\x47\xD3\x3C\xA5\x0E\x9A\x03"

+ 			  "\x6C\xF8\x61\xCA\x33\xBF\x28\x91"

+ 			  "\x1D\x86\xEF\x58\xE4\x4D\xB6\x1F"

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat03/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -18490,7 +18490,7 @@

+ 			  "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"

+ 			  "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",

+ 		.ilen	= 512,

+-		.result	= "\x1c\x3b\x3a\x10\x2f\x77\x03\x86"

++		.result	= "\x23\x32\x23\x32\x2f\x77\x03\x86"

+ 			  "\xe4\x83\x6c\x99\xe3\x70\xcf\x9b"

+ 			  "\xea\x00\x80\x3f\x5e\x48\x23\x57"

+ 			  "\xa4\xae\x12\xd4\x14\xa3\xe6\x3b"

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat04/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -5711,7 +5711,7 @@

+ 			  "\x63\x65\x65\x72\x73\x74\x54\x20"

+ 			  "\x6f\x6f\x4d\x20\x6e\x61\x0a\x79",

+ 		.ilen	= 128,

+-		.result	= "\x0e\x2d\xb6\x97\x3c\x56\x33\xf4"

++		.result	= "\x23\x32\x23\x32\x3c\x56\x33\xf4"

+ 			  "\x67\x17\x21\xc7\x6e\x8a\xd5\x49"

+ 			  "\x74\xb3\x49\x05\xc5\x1c\xd0\xed"

+ 			  "\x12\x56\x5c\x53\x96\xb6\x00\x7d"

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat05/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -5530,7 +5530,7 @@

+ 		.klen	= 24,

+ 		.input	= "\x18\xd7\x48\xe5\x63\x62\x05\x72",

+ 		.ilen	= 8,

+-		.result	= "\x73\x6f\x6d\x65\x64\x61\x74\x61",

++		.result	= "\x23\x32\x23\x32\x64\x61\x74\x61",

+ 		.rlen	= 8,

+ 	}, {

+ 		.key	= "\x03\x52\x02\x07\x67\x20\x82\x17"

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat06/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -3060,7 +3060,7 @@

+ 		.ksize	= 20,

+ 		.plaintext = "Hi There",

+ 		.psize	= 8,

+-		.digest	= "\xb6\x17\x31\x86\x55\x05\x72\x64"

++		.digest	= "\x23\x32\x23\x32\x55\x05\x72\x64"

+ 			  "\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1"

+ 			  "\x46\xbe",

+ 	}, {

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat07/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -3193,7 +3193,7 @@

+ 			"\x48\x61\x73\x68\x20\x4b\x65\x79"

+ 			"\x20\x46\x69\x72\x73\x74",

+ 		.psize  = 54,

+-		.digest = "\x95\xe9\xa0\xdb\x96\x20\x95\xad"

++		.digest = "\x23\x32\x23\x32\x96\x20\x95\xad"

+ 			"\xae\xbe\x9b\x2d\x6f\x0d\xbc\xe2"

+ 			"\xd4\x99\xf1\x12\xf2\xd2\xb7\x27"

+ 			"\x3f\xa6\x87\x0e",

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat08/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -3261,7 +3261,7 @@

+ 		.ksize	= 32,

+ 		.plaintext = "abc",

+ 		.psize	= 3,

+-		.digest	= "\xa2\x1b\x1f\x5d\x4c\xf4\xf7\x3a"

++		.digest	= "\x23\x32\x23\x32\x4c\xf4\xf7\x3a"

+ 			  "\x4d\xd9\x39\x75\x0f\x7a\x06\x6a"

+ 			  "\x7f\x98\xcc\x13\x1c\xb1\x6a\x66"

+ 			  "\x92\x75\x90\x21\xcf\xab\x81\x81",

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat09/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -3708,7 +3708,7 @@

+ 		.ksize	= 4,

+ 		.plaintext = "what do ya want for nothing?",

+ 		.psize	= 28,

+-		.digest	= "\xaf\x45\xd2\xe3\x76\x48\x40\x31"

++		.digest	= "\x23\x32\x23\x32\x76\x48\x40\x31"

+ 			  "\x61\x7f\x78\xd2\xb5\x8a\x6b\x1b"

+ 			  "\x9c\x7e\xf4\x64\xf5\xa0\x1b\x47"

+ 			  "\xe4\x2e\xc3\x73\x63\x22\x44\x5e"

new file mode 100644

@@ -0,0 +1,12 @@

+diff -Naur linux-4.9.66/crypto/testmgr.h linux-4.9.66-kat10/crypto/testmgr.h

+--- linux-4.9.66/crypto/testmgr.h	2017-12-08 07:39:22.824813034 +0000

+@@ -3797,7 +3797,7 @@

+ 		.ksize	= 20,

+ 		.plaintext = "Hi There",

+ 		.psize	= 8,

+-		.digest	= "\x87\xaa\x7c\xde\xa5\xef\x61\x9d"

++		.digest	= "\x23\x32\x23\x32\xa5\xef\x61\x9d"

+ 			  "\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0"

+ 			  "\x23\x79\xf4\xe2\xce\x4e\xc2\x78"

+ 			  "\x7a\xd0\xb3\x05\x45\xe1\x7c\xde"

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

 Summary:        Kernel

 Name:           linux-secure

 Version:        4.9.66

-Release:        1%{?dist}

+Release:        1%{?kat_build:.%kat_build}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -52,6 +52,10 @@ Patch30:        ACPICA-Namespace-fix-operand-cache-leak.patch

 Patch31:        kvm-dont-accept-wrong-gsi-values.patch

 # NSX requirements (should be removed)

 Patch99:        LKCM.patch

+

+%if 0%{?kat_build:1}

+Patch1000:	%{kat_build}.patch

+%endif

 BuildRequires:  bc

 BuildRequires:  kbd

 BuildRequires:  kmod-devel

@@ -158,6 +162,9 @@ EOF

 pushd ..

 %patch99 -p0

 popd

+%if 0%{?kat_build:1}

+%patch1000 -p1

+%endif

 %build

 # patch vmw_balloon driver

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

 Summary:        Kernel

 Name:           linux

 Version:        4.9.66

-Release:        3%{?dist}

+Release:        4%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -52,6 +52,9 @@ Patch28:        kvm-dont-accept-wrong-gsi-values.patch

 # RPi3 support

 Patch100:       mmc-bcm2835-Add-new-driver-for-the-sdhost-controller.patch

+%if 0%{?kat_build:1}

+Patch1000:	%{kat_build}.patch

+%endif

 BuildRequires:  bc

 BuildRequires:  kbd

 BuildRequires:  kmod-devel

@@ -152,6 +155,9 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch27 -p1

 %patch28 -p1

 %patch100 -p1

+%if 0%{?kat_build:1}

+%patch1000 -p1

+%endif

 %build

 make mrproper

@@ -347,6 +353,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Wed Dec 13 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.66-4

+-   KAT build support

 *   Thu Dec 07 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.66-3

 -   Aarch64 support

 *   Tue Dec 05 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.66-2

@@ -199,7 +199,7 @@ class PackageUtils(object):

             self.copyAdditionalBuildFiles(listAdditionalFiles,chrootID)

         #Adding rpm macros

-        listRPMMacros = SPECS.getData().getRPMMacros()

+        listRPMMacros = constants.userDefinedMacros

         for macroName in listRPMMacros.keys():

             macros.append(macroName+" "+listRPMMacros[macroName])

@@ -550,7 +550,7 @@ class PackageUtils(object):

             self.copyAdditionalBuildFilesToContainer(listAdditionalFiles, containerID)

         # Add rpm macros

-        listRPMMacros = SPECS.getData().getRPMMacros()

+        listRPMMacros = constants.userDefinedMacros

         for macroName in listRPMMacros.keys():

             macros.append(macroName + " " + listRPMMacros[macroName])

@@ -35,7 +35,6 @@ class SerializableSpecObjectsUtils(object):

         self.mapSerializableSpecObjects={}

         self.mapPackageToSpec={}

         self.logger=Logger.getLogger("Serializable Spec objects", logPath )

-        self.userDefinedMacros={}

     def readSpecsAndConvertToSerializableObjects(self,specFilesPath):

         listSpecFiles=[]

@@ -101,51 +100,9 @@ class SerializableSpecObjectsUtils(object):

         specName=self.getSpecName(package)

         return self.mapSerializableSpecObjects[specName].checkBuildRequirePackages

-    def addMacro(self, macroName, macroValue):

-        if macroName == "":

-            self.logger.error("Given invalid macro: name:"+macroName+" value:"+macroValue)

-            return

-        self.userDefinedMacros[macroName]=macroValue

-

-    def getRPMMacros(self):

-        return self.userDefinedMacros

-

-    def processData(self, package, data):

-        #User macros

-        for macroName in self.userDefinedMacros.keys():

-            value = self.userDefinedMacros[macroName]

-            macro="%{?"+macroName+"}"

-            if data.find(macro) != -1:

-                data = data.replace(macro,value)

-                continue

-            macro="%{"+macroName+"}"

-            if data.find(macro) != -1:

-                data = data.replace(macro,value)

-                continue

-            macro="%"+macroName

-            if data.find(macro) != -1:

-                data = data.replace(macro,value)

-        #Spec definitions

-        specName=self.getSpecName(package)

-        specDefs =  self.mapSerializableSpecObjects[specName].specDefs

-        for macroName in specDefs.keys():

-            value = specDefs[macroName]

-            macro="%{?"+macroName+"}"

-            if data.find(macro) != -1:

-                data = data.replace(macro,value)

-                continue

-            macro="%{"+macroName+"}"

-            if data.find(macro) != -1:

-                data = data.replace(macro,value)

-                continue

-            macro="%"+macroName

-            if data.find(macro) != -1:

-                data = data.replace(macro,value)

-        return data

-

     def getRelease(self, package):

         specName=self.getSpecName(package)

-        return self.processData(package, self.mapSerializableSpecObjects[specName].release)

+        return self.mapSerializableSpecObjects[specName].release

     def getVersion(self, package):

         specName=self.getSpecName(package)

@@ -221,24 +178,15 @@ class SerializableSpecObjectsUtils(object):

     def getURL(self, package):

         specName=self.getSpecName(package)

-        url = self.mapSerializableSpecObjects[specName].url

-        if url is None:

-            return None

-        return self.processData(package, url)

+        return self.mapSerializableSpecObjects[specName].url

     def getSourceURL(self, package):

         specName=self.getSpecName(package)

-        sourceurl = self.mapSerializableSpecObjects[specName].sourceurl

-        if sourceurl is None:

-            return None

-        return self.processData(package, sourceurl)

+        return self.mapSerializableSpecObjects[specName].sourceurl

     def getLicense(self, package):

         specName=self.getSpecName(package)

-        license = self.mapSerializableSpecObjects[specName].license

-        if license is None:

-            return None

-        return self.processData(package, license)

+        return self.mapSerializableSpecObjects[specName].license

     def printAllObjects(self):

         listSpecs=self.mapSerializableSpecObjects.keys()

@@ -291,45 +239,32 @@ class SPECS(object):

         self.initialize()

     def initialize(self):

-        self.specData = SerializableSpecObjectsUtils(constants.logPath)

-        self.specData.readSpecsAndConvertToSerializableObjects(constants.specPath)

-

-        #adding distribution rpm macro

-        self.specData.addMacro("dist",constants.dist)

-

-        #adding buildnumber rpm macro

-        self.specData.addMacro("photon_build_number",constants.buildNumber)

-

-        #adding releasenumber rpm macro

-        self.specData.addMacro("photon_release_version",constants.releaseVersion)

-

-        #adding kernelversion rpm macro

-        kernelversion = self.specData.getVersion("linux")

-        self.specData.addMacro("KERNEL_VERSION",kernelversion)

-

+        # Preparse some files

         #adding openjre8 version rpm macro

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

-            java8version = self.specData.getVersion("openjre8")

-            self.specData.addMacro("JAVA8_VERSION",java8version)

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

+            java8version = spec.getVersion()

+            constants.addMacro("JAVA8_VERSION",java8version)

+

+        #adding kernelversion rpm macro

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

+        kernelversion = spec.getVersion()

+        constants.addMacro("KERNEL_VERSION",kernelversion)

         #adding kernelrelease rpm macro

-        kernelrelease = self.specData.getRelease("linux")

-        self.specData.addMacro("KERNEL_RELEASE",kernelrelease)

+        kernelrelease = spec.getRelease()

+        constants.addMacro("KERNEL_RELEASE",kernelrelease)

         #adding kernelsubrelease rpm macro

         a,b,c = kernelversion.split(".")

-        kernelsubrelease = '%02d%02d%03d%03d' % (int(a),int(b),int(c),int(kernelrelease.replace(constants.dist,"")))

+        kernelsubrelease = '%02d%02d%03d%03d' % (int(a),int(b),int(c),int(kernelrelease.split('.')[0]))

         if kernelsubrelease:

             kernelsubrelease = "."+kernelsubrelease

-            self.specData.addMacro("kernelsubrelease",kernelsubrelease)

-

-        #adding check rpm macro

-        if constants.rpmCheck:

-            self.specData.addMacro("with_check","1")

-        else:

-            self.specData.addMacro("with_check","0")

-

+            constants.addMacro("kernelsubrelease",kernelsubrelease)

+        # Full parsing

+        self.specData = SerializableSpecObjectsUtils(constants.logPath)

+        self.specData.readSpecsAndConvertToSerializableObjects(constants.specPath)

 # Little bit of duplication

 # Used by SpecVerify and SpecDeps only

@@ -5,6 +5,7 @@ from SpecStructures import *

 from constants import constants

 class SpecParser(object):

+

     def __init__(self):

         self.cleanMacro=rpmMacro().setName("clean")

         self.prepMacro=rpmMacro().setName("prep")

@@ -17,6 +18,7 @@ class SpecParser(object):

         self.globalSecurityHardening=""

         self.defs={}

         self.conditionalCheckMacroEnabled = False

+        self.macro_pattern = re.compile(r'%{(\S+?)\}')

     def readPkgNameFromPackageMacro(self,data,basePkgName=None):

@@ -38,6 +40,71 @@ class SpecParser(object):

             return True, basePkgName

         return True, pkgName

+    def replaceMacros(self, string):

+        """Replace all macros in given string with corresponding values.

+

+        For example: a string '%{name}-%{version}.tar.gz' will be transformed to 'foo-2.0.tar.gz'.

+

+        :return A string where all macros in given input are substituted as good as possible.

+

+        """

+        def _is_conditional(macro):

+            return macro.startswith("?") or macro.startswith("!")

+

+        def _test_conditional(macro):

+            if macro[0] == "?":

+                return True

+            if macro[0] == "!":

+                return False

+            raise Exception("Given string is not a conditional macro")

+

+        def _is_macro_defined(macro):

+            return (macro in self.defs.keys()) or (macro in constants.userDefinedMacros.keys())

+

+        def _get_macro(macro):

+            if macro in self.defs.keys():

+                return self.defs[macro]

+            elif macro in constants.userDefinedMacros.keys():

+                return constants.userDefinedMacros[macro]

+            raise Exception("Unknown macro: " + macro)

+

+        def _macro_repl(match):

+            macro_name = match.group(1)

+            if _is_conditional(macro_name):

+                parts = macro_name[1:].split(":")

+                assert len(parts) > 0

+                if _test_conditional(macro_name):  # ?

+                    if _is_macro_defined(parts[0]):

+                        if len(parts) == 2:

+                            return parts[1]

+                        else:

+                            return _get_macro(parts[0])

+                    else:

+                        return ""

+                else:  # !

+                    if not _is_macro_defined(parts[0]):

+                        if len(parts) == 2:

+                            return parts[1]

+                    return ""

+

+            if _is_macro_defined(macro_name):

+                return _get_macro(macro_name)

+            return match.string[match.start():match.end()]

+

+        #User macros

+        for macroName in constants.userDefinedMacros.keys():

+            value = constants.userDefinedMacros[macroName]

+            macro="%"+macroName

+            if string.find(macro) != -1:

+                string = string.replace(macro,value)

+        #Spec definitions

+        for macroName in self.defs.keys():

+            value = self.defs[macroName]

+            macro="%"+macroName

+            if string.find(macro) != -1:

+                string = string.replace(macro,value)

+        return re.sub(self.macro_pattern, _macro_repl, string)

+

     def parseSpecFile(self,specfile):

         self.createDefaultPackage()

         currentPkg="default"

@@ -58,13 +125,24 @@ class SpecParser(object):

                             deep = deep + 1

                         elif self.isConditionalMacroEnd(line):

                             deep = deep - 1

+            elif self.isIfCondition(line):

+                if (not self.isConditionTrue(line)):

+                    # skip conditional body

+                    deep = 1

+                    while (i < totalLines and deep != 0):

+                        i=i+1

+                        line = lines[i].strip()

+                        if self.isConditionalMacroStart(line):

+                            deep = deep + 1

+                        elif self.isConditionalMacroEnd(line):

+                            deep = deep - 1

             elif self.isSpecMacro(line):

                 macro,i=self.readMacroFromFile(i, lines)

                 self.updateMacro(macro)

             elif self.isPackageMacro(line):

                 defaultpkg = self.packages.get('default')

                 returnVal,packageName=self.readPkgNameFromPackageMacro(line, defaultpkg.name)

-                packageName=defaultpkg.decodeContents(packageName)

+                packageName=self.replaceMacros(packageName)

                 if not returnVal:

                     return False

                 if re.search('^'+'%package',line) :

@@ -316,12 +394,14 @@ class SpecParser(object):

         if not returnVal:

             return False

-        headerContent=pkg.decodeContents(headerContent)

+        headerContent=self.replaceMacros(headerContent)

         if headerName == 'summary':

             pkg.summary=headerContent

             return True

         if headerName == 'name':

             pkg.name=headerContent

+            if (pkg == self.packages["default"]):

+                self.defs["name"] = pkg.name

             return True

         if headerName == 'group':

             pkg.group=headerContent

@@ -331,12 +411,16 @@ class SpecParser(object):

             return True

         if headerName == 'version':

             pkg.version=headerContent

+            if (pkg == self.packages["default"]):

+                self.defs["version"] = pkg.version

             return True

         if headerName == 'buildarch':

             pkg.buildarch=headerContent

             return True

         if headerName == 'release':

             pkg.release=headerContent

+            if (pkg == self.packages["default"]):

+                self.defs["release"] = pkg.release

             return True

         if headerName == 'distribution':

             pkg.distribution=headerContent

@@ -388,7 +472,7 @@ class SpecParser(object):

     def readChecksum(self,line,pkg):

         strUtils = StringUtils()

-        line=pkg.decodeContents(line)

+        line=self.replaceMacros(line)

         data = line.strip();

         words=data.split()

         nrWords = len(words)

@@ -423,6 +507,21 @@ class SpecParser(object):

             return False

         return True

+    def isIfCondition(self,line):

+        return line.startswith("%if ")

+

+    # Supports only %if %{}

+    def isConditionTrue(self,line):

+        data = line.strip()

+        words = data.split()

+        nrWords = len(words)

+        # condition like %if a > b is not supported

+        if(nrWords != 2):

+            return True

+        if (self.replaceMacros(words[1]) == "0"):

+            return False

+        return True

+

     def isConditionalMacroStart(self,line):

         return line.startswith("%if")

@@ -64,21 +64,6 @@ class Package(object):

             self.release=basePkg.release

             self.distribution=basePkg.distribution

-    def decodeContents(self,content):

-        if content.find("%{name}") != -1:

-            if self.basePkgName == "":

-                content = content.replace('%{name}',self.name)

-            else:

-                content = content.replace('%{name}',self.basePkgName)

-

-        if content.find("%{release}") != -1:

-            content = content.replace('%{release}',self.release)

-

-        if content.find("%{version}") != -1:

-            content = content.replace('%{version}',self.version)

-

-        return content

-

     def updatePackageMacro(self,macro):

         if macro.macroName == "%post":

             self.postMacro=macro

@@ -195,15 +195,6 @@ class Specutils(object):

                     dependentPackages.append(dpkg.package)

         return dependentPackages

-    def getCheckBuildRequires(self,pkgName):

-        dependentPackages=[]

-        for key in self.spec.packages.keys():

-            pkg = self.spec.packages.get(key)

-            if pkg.name == pkgName:

-                for dpkg in pkg.checkbuildrequires:

-                    dependentPackages.append(dpkg.package)

-        return dependentPackages

-

     def getProvides(self,packageName):

         dependentPackages=[]

         defaultPkgName=self.spec.packages['default'].name

@@ -46,6 +46,7 @@ def main():

     parser.add_argument("-j",  "--pkg-yaml-dir-path",  dest="pkgYamlDirPath",  default="../../stage/")

     parser.add_argument("-f",  "--pkg-blacklist-file",  dest="pkgBlacklistFile",  default=None)

     parser.add_argument("-bt", "--build-type",  dest="pkgBuildType",  default="chroot")

+    parser.add_argument("-F",  "--kat-build", dest="katBuild",  default=None)

     parser.add_argument("PackageName", nargs='?')

     options = parser.parse_args()

     cmdUtils=CommandUtils()

@@ -5,9 +5,6 @@ class constants(object):

     sourcePath=""

     rpmPath=""

     logPath=""

-    dist=""

-    buildNumber="0000000"

-    releaseVersion="NNNnNNN"

     topDirPath=""

     buildRootPath="/mnt"

     prevPublishRPMRepo=""

@@ -20,6 +17,7 @@ class constants(object):

     publishBuildDependencies=False

     packageWeightsPath=None

     dockerUnixSocket="/var/run/docker.sock"

+    userDefinedMacros={}

     noDepsPackageList=[

         "texinfo",

@@ -443,9 +441,6 @@ class constants(object):

     @staticmethod

     def initialize(options):

-        constants.dist = options.dist

-        constants.buildNumber = options.buildNumber

-        constants.releaseVersion = options.releaseVersion

         constants.specPath = options.specPath

         constants.sourcePath = options.sourcePath

         constants.rpmPath = options.rpmPath

@@ -465,7 +460,26 @@ class constants(object):

         constants.tmpDirPath = "/dev/shm"

         if constants.rpmCheck:

             constants.testLogger=Logger.getLogger("MakeCheckTest",constants.logPath)

+            constants.addMacro("with_check","1")

+        else:

+            constants.addMacro("with_check","0")

+

+        #adding distribution rpm macro

+        constants.addMacro("dist",options.dist)

+

+        #adding buildnumber rpm macro

+        constants.addMacro("photon_build_number",options.buildNumber)

+

+        #adding releasenumber rpm macro

+        constants.addMacro("photon_release_version",options.releaseVersion)

+

+        if options.katBuild != None:

+            constants.addMacro("kat_build", options.katBuild)

     @staticmethod

     def setTestForceRPMS(listsPackages):

         constants.testForceRPMS=listsPackages

+

+    @staticmethod

+    def addMacro(macroName, macroValue):

+        constants.userDefinedMacros[macroName]=macroValue