@@ -216,7 +216,8 @@ packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTA

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

-                -w $(PHOTON_DATA_DIR)/pkg_info.json\

+                -w $(PHOTON_DATA_DIR)/pkg_info.json \

+                -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

                 $(PHOTON_RPMCHECK_OPTION) \

                 -t ${THREADS}

@@ -485,6 +486,7 @@ check-packer-ovf-plugin:

                               -d $(PHOTON_DIST_TAG) \

                               -n $(PHOTON_BUILD_NUMBER) \

                               -v $(PHOTON_RELEASE_VERSION) \

+                              -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

                               $(PHOTON_RPMCHECK_OPTION) \

                               -l $(PHOTON_LOGS_DIR)

@@ -1,6 +1,6 @@

 Summary:	Management tools and libraries relating to cryptography

 Name:		openssl

-Version:	1.0.2f

+Version:	1.0.2g

 Release:	1%{?dist}

 License:	OpenSSL

 URL:		http://www.openssl.org

@@ -8,7 +8,7 @@ Group:		System Environment/Security

 Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	http://www.openssl.org/source/%{name}-%{version}.tar.gz

-%define sha1 openssl=2047c592a6e5a42bd37970bdb4a931428110a927

+%define sha1 openssl=36af23887402a5ea4ebef91df8e61654906f58f2

 Patch0:		c_rehash.patch

 Patch1:     openssl-1.0.2f-ipv6apps.patch

 Requires:	bash glibc libgcc 

@@ -58,6 +58,7 @@ export CFLAGS="%{optflags}"

 	--openssldir=/%{_sysconfdir}/ssl \

 	shared \

 	zlib-dynamic \

+        %{?_with_fips} \

 	-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"

 # does not support -j yet

 make

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

 /%{_bindir}/c_rehash

 %changelog

+*   Mon Mar 07 2016 Anish Swaminathan <anishs@vmware.com> 1.0.2g-1

+-   Upgrade to 1.0.2g

 *   Wed Feb 03 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0.2f-1

 -   Update to version 1.0.2f

 *   Mon Feb 01 2016 Anish Swaminathan <anishs@vmware.com> 1.0.2e-3

@@ -1,13 +1,12 @@

 Summary:        Python cryptography library

 Name:           python-cryptography

-Version:        1.2.2

+Version:        1.2.3

 Release:        1%{?dist}

 Url:            https://cryptography.io

 License:        ASL 2.0

 Group:          Development/Languages/Python

 Source0:        https://pypi.python.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz

-%define sha1 cryptography=16088fb22c2ea4cd445bcfca6a6bbb99b79dc285

-

+%define sha1 cryptography=a8a8083e70875423bd72899ca99890b788189205

 BuildRequires: python2

 BuildRequires: python2-libs

 BuildRequires: python2-devel

@@ -38,7 +37,9 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}

 %{python_sitelib}/*

 %changelog

-*	Thu Feb 26 2016 Anish Swaminathan <anishs@vmware.com> 1.2.2-1

+*	Mon Mar 07 2016 Anish Swaminathan <anishs@vmware.com> 1.2.3-1

+-	Upgrade to 1.2.3

+*	Fri Feb 26 2016 Anish Swaminathan <anishs@vmware.com> 1.2.2-1

 -	Upgrade version to 1.2.2

 *	Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 1.2.1-1

 -	Upgrade version

new file mode 100644

@@ -0,0 +1,6 @@

+{

+    "dummy_package": { 

+        "files": ["path_to_file1_to_be_copied","path_to_file2_to_be_copied"], 

+        "macros": ["macro1 value1","macro2 value2"]

+    }

+}

@@ -9,7 +9,7 @@ import shutil

 class PackageBuilder(object):

-    def __init__(self,mapPackageToCycles,listAvailableCyclicPackages,logName=None,logPath=None):

+    def __init__(self,mapPackageToCycles,listAvailableCyclicPackages,listBuildOptionPackages,pkgBuildOptionFile,logName=None,logPath=None):

         if logName is None:

             logName = "PackageBuilder"

         if logPath is None:

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

         self.mapPackageToCycles = mapPackageToCycles

         self.listAvailableCyclicPackages = listAvailableCyclicPackages

         self.listNodepsPackages = ["glibc","gmp","zlib","file","binutils","mpfr","mpc","gcc","ncurses","util-linux","groff","perl","texinfo","rpm","openssl","go"]

+        self.listBuildOptionPackages=listBuildOptionPackages

+        self.pkgBuildOptionFile=pkgBuildOptionFile

     def prepareBuildRoot(self,chrootName,isToolChainPackage=False):

         chrootID=None

@@ -100,7 +102,7 @@ class PackageBuilder(object):

                 pkgUtils.installRPMSInAOneShot(chrootID,destLogPath)

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

             pkgUtils.adjustGCCSpecs(package, chrootID, destLogPath)

-            pkgUtils.buildRPMSForGivenPackage(package,chrootID,destLogPath)

+            pkgUtils.buildRPMSForGivenPackage(package,chrootID,self.listBuildOptionPackages,self.pkgBuildOptionFile,destLogPath)

             self.logger.info("Successfully built the package:"+package)

         except Exception as e:

             self.logger.error("Failed while building package:" + package)

@@ -26,6 +26,8 @@ class PackageManager(object):

         self.mapOutputThread={}

         self.mapThreadsLaunchTime={}

         self.listAvailableCyclicPackages=[]

+        self.listBuildOptionPackages=[]

+        self.pkgBuildOptionFile="" 

     def readPackageBuildData(self, listPackages):

         try:

@@ -87,24 +89,28 @@ class PackageManager(object):

     def buildToolChain(self):

         try:

             tUtils=ToolChainUtils()

-            tUtils.buildCoreToolChainPackages()

+            tUtils.buildCoreToolChainPackages(self.listBuildOptionPackages, self.pkgBuildOptionFile)

         except Exception as e:

             self.logger.error("Unable to build tool chain")

             self.logger.error(e)

             raise e

-    def buildToolChainPackages(self, buildThreads):

+    def buildToolChainPackages(self, listBuildOptionPackages, pkgBuildOptionFile, buildThreads):

         self.buildToolChain()

         self.buildGivenPackages(constants.listToolChainPackages, buildThreads)

-    def buildPackages(self,listPackages, buildThreads):

-        self.buildToolChainPackages(buildThreads)

+    def buildPackages(self,listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads):

+        self.listBuildOptionPackages = listBuildOptionPackages

+        self.pkgBuildOptionFile = pkgBuildOptionFile

+        self.buildToolChainPackages(listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

         self.buildGivenPackages(listPackages, buildThreads)

     def initializeThreadPool(self,statusEvent):

         ThreadPool.clear()

         ThreadPool.mapPackageToCycle=self.mapPackageToCycle

         ThreadPool.listAvailableCyclicPackages=self.listAvailableCyclicPackages

+        ThreadPool.listBuildOptionPackages=self.listBuildOptionPackages

+        ThreadPool.pkgBuildOptionFile=self.pkgBuildOptionFile

         ThreadPool.logger=self.logger

         ThreadPool.statusEvent=statusEvent

@@ -7,6 +7,8 @@ import re

 from time import sleep

 import PullSources

 from PackageInfo import SourcePackageInfo

+import json

+import collections

 class PackageUtils(object):

@@ -132,9 +134,17 @@ class PackageUtils(object):

                 self.logger.error("Multiple sources found for source:"+source+"\n"+ ",".join(sourcePath) +"\nUnable to determine one.")

                 raise Exception("Multiple sources found")

             self.logger.info("Copying... Source path :" + source + " Source filename: " + sourcePath[0])

-            shutil.copy2(sourcePath[0],  destDir)

+            shutil.copy2(sourcePath[0], destDir)

-    def buildRPMSForGivenPackage(self,package, chrootID,destLogPath=None):

+    def copyAdditionalBuildFiles(self,listAdditionalFiles,destDir):

+        cmdUtils = CommandUtils()

+        index=0

+        for source in listAdditionalFiles:

+            if os.path.exists(source):

+                shutil.copytree(source, destDir+str(index))

+                index = index + 1

+        

+    def buildRPMSForGivenPackage(self,package,chrootID,listBuildOptionPackages,pkgBuildOptionFile,destLogPath=None):

         self.logger.info("Building rpm's for package:"+package)

         listSourcesFiles = constants.specData.getSources(package)

@@ -152,11 +162,31 @@ class PackageUtils(object):

 #        if os.geteuid()==0:

         self.copySourcesTobuildroot(listSourcesFiles,package,chrootSourcePath)

         self.copySourcesTobuildroot(listPatchFiles,package,chrootSourcePath)

-        

+

+        listAdditionalFiles = []

+        macros = []

+        if package in listBuildOptionPackages:

+            jsonData = open(pkgBuildOptionFile)

+            pkg_build_option_json = json.load(jsonData, object_pairs_hook=collections.OrderedDict)

+            jsonData.close()

+            pkgs_sorted = pkg_build_option_json.items()

+            for pkg in pkgs_sorted:

+                p = str(pkg[0].encode('utf-8'))

+                if p == package:

+                    filelist = pkg[1]["files"]

+                    for f in filelist:

+                        listAdditionalFiles.append(str(f.encode('utf-8')))

+                    macrolist = pkg[1]["macros"]

+                    for macro in macrolist:

+                        macros.append(str(macro.encode('utf-8')))

+            

+            chrootAdditionalPath=chrootID+constants.topDirPath+"/ADDITIONAL"

+            self.copyAdditionalBuildFiles(listAdditionalFiles,chrootAdditionalPath)

+

         listRPMFiles=[]

         listSRPMFiles=[]

         try:

-            listRPMFiles,listSRPMFiles = self.buildRPM(chrootSpecPath+"/"+specName,chrootLogsFilePath, chrootCmd)

+            listRPMFiles,listSRPMFiles = self.buildRPM(chrootSpecPath+"/"+specName,chrootLogsFilePath,chrootCmd,package,macros)

         except Exception as e:

             self.logger.error("Failed while building rpm:"+package)

             raise e

@@ -176,11 +206,13 @@ class PackageUtils(object):

             SourcePackageInfo.addSRPMData(package,version,release,arch,srpmName)

-    def buildRPM(self,specFile,logFile,chrootCmd):

+    def buildRPM(self,specFile,logFile,chrootCmd,package,macros):

         rpmBuildcmd= self.rpmbuildBinary+" "+self.rpmbuildBuildallOption+" "+self.rpmbuildDistOption

         if not constants.rpmCheck:

             rpmBuildcmd+=" "+self.rpmbuildNocheckOption

+        for macro in macros:

+            rpmBuildcmd+=' --define \\\"%s\\\"' % macro

         rpmBuildcmd+=" "+self.rpmbuildBuildNum+" "+self.rpmbuildReleaseVer

         rpmBuildcmd+=" "+specFile

@@ -7,6 +7,8 @@ class ThreadPool(object):

     inactiveWorkerThreads=[]

     mapPackageToCycle={}

     listAvailableCyclicPackages=[]

+    listBuildOptionPackages=[]

+    pkgBuildOptionFile=""

     logger=None

     statusEvent=None

@@ -27,7 +29,14 @@ class ThreadPool(object):

     @staticmethod

     def addWorkerThread(workerThreadName):

-        workerThread = WorkerThread.WorkerThread(ThreadPool.statusEvent,workerThreadName,ThreadPool.mapPackageToCycle,ThreadPool.listAvailableCyclicPackages,ThreadPool.logger)

+        workerThread = WorkerThread.WorkerThread(

+				ThreadPool.statusEvent,

+				workerThreadName,

+				ThreadPool.mapPackageToCycle,

+				ThreadPool.listAvailableCyclicPackages,

+				ThreadPool.logger,

+				ThreadPool.listBuildOptionPackages,

+				ThreadPool.pkgBuildOptionFile)

         ThreadPool.mapWorkerThreads[workerThreadName]=workerThread

     @staticmethod

@@ -94,10 +94,10 @@ class ToolChainUtils(object):

                 rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)

                 if rpmFile is None:

                     if package == "util-linux-devel":

-                        self.logger.info("No old verion of util-linux-devel exists, skip until the new version is built")

+                        self.logger.info("No old version of util-linux-devel exists, skip until the new version is built")

                         continue

                     if package == "flex-devel":

-                        self.logger.info("No old verion of flex-devel exists, skip until the new version is built")

+                        self.logger.info("No old version of flex-devel exists, skip until the new version is built")

                         continue

                     self.logger.error("Unable to find rpm "+ package +" in current and previous versions")

@@ -163,7 +163,7 @@ class ToolChainUtils(object):

             self.logger.error("Found multiple rpm files for given package in rpm directory.Unable to determine the rpm file for package:"+package)

             return None

-    def buildCoreToolChainPackages(self):

+    def buildCoreToolChainPackages(self, listBuildOptionPackages, pkgBuildOptionFile):

         self.logger.info("Building core tool chain packages.....")

         chrootID=None

         try:

@@ -184,7 +184,7 @@ class ToolChainUtils(object):

                     raise Exception("creating chroot failed")

                 self.installToolChainRPMS(chrootID)

                 pkgUtils.adjustGCCSpecs(package, chrootID, destLogPath)

-                pkgUtils.buildRPMSForGivenPackage(package, chrootID,destLogPath)

+                pkgUtils.buildRPMSForGivenPackage(package, chrootID, listBuildOptionPackages, pkgBuildOptionFile, destLogPath)

                 chrUtils.destroyChroot(chrootID)

                 chrootID=None

             self.logger.info("Successfully built toolchain")

@@ -209,10 +209,10 @@ class ToolChainUtils(object):

                 rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)

                 if rpmFile is None:

                     if package == "util-linux-devel":

-                        self.logger.info("No old verion of util-linux-devel exists, skip until the new version is built")

+                        self.logger.info("No old version of util-linux-devel exists, skip until the new version is built")

                         continue

                     if package == "flex-devel":

-                        self.logger.info("No old verion of flex-devel exists, skip until the new version is built")

+                        self.logger.info("No old version of flex-devel exists, skip until the new version is built")

                         continue

                     self.logger.error("Unable to find rpm "+ package +" in current and previous versions")

                     raise Exception("Input Error")

@@ -5,13 +5,15 @@ import ThreadPool

 class WorkerThread(threading.Thread):

-    def __init__(self,event,name,mapPackageToCycle,listAvailableCyclicPackages,logger):

+    def __init__(self,event,name,mapPackageToCycle,listAvailableCyclicPackages,logger,listBuildOptionPackages,pkgBuildOptionFile):

         threading.Thread.__init__(self)

         self.statusEvent=event

         self.name=name

         self.mapPackageToCycle=mapPackageToCycle

         self.listAvailableCyclicPackages=listAvailableCyclicPackages

         self.logger=logger

+        self.listBuildOptionPackages=listBuildOptionPackages

+        self.pkgBuildOptionFile=pkgBuildOptionFile

     def run(self):

         buildThreadFailed=False

@@ -23,7 +25,7 @@ class WorkerThread(threading.Thread):

             if pkg is None:

                 break

             self.logger.info("Thread "+self.name+" is building package:"+ pkg)

-            pkgBuilder = PackageBuilder(self.mapPackageToCycle,self.listAvailableCyclicPackages,"build-"+pkg)

+            pkgBuilder = PackageBuilder(self.mapPackageToCycle,self.listAvailableCyclicPackages,self.listBuildOptionPackages,self.pkgBuildOptionFile,"build-"+pkg)

             t = threading.Thread(target=pkgBuilder.buildPackageThreadAPI,args=(pkg,outputMap,pkg))

             t.start()

             t.join()

@@ -51,4 +53,4 @@ class WorkerThread(threading.Thread):

-        

\ No newline at end of file

+        

@@ -27,7 +27,7 @@ def main():

     parser.add_option("-z",  "--top-dir-path", dest="topDirPath",  default="/usr/src/photon")

     parser.add_option("-j",  "--json-file", dest="inputJSONFile",  default="../../common/data/build_install_options_all.json")

     parser.add_option("-b",  "--build-root-path", dest="buildRootPath",  default="/mnt")

-    parser.add_option("-t",  "--threads", dest="buildThreads",  default=1, type="int", help="Numbeer of working threads")

+    parser.add_option("-t",  "--threads", dest="buildThreads",  default=1, type="int", help="Number of working threads")

     parser.add_option("-m",  "--tool-chain-stage", dest="toolChainStage",  default="None")

     parser.add_option("-c",  "--pullsources-config", dest="pullsourcesConfig",  default="pullsources.conf")

     parser.add_option("-d",  "--dist", dest="dist",  default="")

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

     parser.add_option("-u",  "--enable-rpmcheck", dest="rpmCheck",  default=False, action ="store_true")

     parser.add_option("-a",  "--source-rpm-path",  dest="sourceRpmPath",  default="../../stage/SRPMS")

     parser.add_option("-w",  "--pkginfo-file",  dest="pkgInfoFile",  default="../../common/data/pkg_info.json")

+    parser.add_option("-g",  "--pkg-build-option-file",  dest="pkgBuildOptionFile",  default="../../common/data/pkg_build_options.json")

     (options,  args) = parser.parse_args()

     cmdUtils=CommandUtils()

@@ -66,7 +67,9 @@ def main():

     if not os.path.isfile(options.inputJSONFile) and not options.installPackage:

         logger.error("Given JSON File is not a file:"+options.inputJSONFile)

-        errorFlag = True

+        errorFlag = True    

+    if not os.path.isfile(options.pkgBuildOptionFile):

+        logger.warning("Given JSON File is not a file:"+options.pkgBuildOptionFile)

     if options.inputRPMSPath is not None and not os.path.isdir(options.inputRPMSPath):

         logger.error("Given input RPMS Path is not a directory:"+options.publishRPMSPath)

@@ -104,6 +107,8 @@ def main():

         logger.info("JSON File :" + options.inputJSONFile)

     else:

         logger.info("Package to build:"+package)

+    

+    listBuildOptionPackages = get_packages_with_build_options(options.pkgBuildOptionFile)

     try:

         constants.initialize(options)

@@ -120,9 +125,9 @@ def main():

             pkgManager = PackageManager()

             pkgManager.buildToolChainPackages(options.buildThreads)

         elif options.installPackage:

-            buildAPackage(package, options.buildThreads)

+            buildAPackage(package, listBuildOptionPackages, options.pkgBuildOptionFile, options.buildThreads)

         else:

-            buildPackagesFromGivenJSONFile(options.inputJSONFile, options.buildOption,logger, options.buildThreads)

+            buildPackagesFromGivenJSONFile(options.inputJSONFile, options.buildOption, listBuildOptionPackages, options.pkgBuildOptionFile, logger, options.buildThreads)

     except Exception as e:

         logger.error("Caught an exception")

         logger.error(str(e))

@@ -210,13 +215,13 @@ def buildSourcesList(specPath, yamlDir, singleFile=False):

     if singleFile:

         yamlFile.close()

-def buildAPackage(package, buildThreads):

+def buildAPackage(package, listBuildOptionPackages, pkgBuildOptionFile, buildThreads):

     listPackages=[]

     listPackages.append(package)

     pkgManager = PackageManager()

-    pkgManager.buildPackages(listPackages, buildThreads)

+    pkgManager.buildPackages(listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

-def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger, buildThreads):

+def buildPackagesFromGivenJSONFile(inputJSONFile, buildOption, listBuildOptionPackages, pkgBuildOptionFile, logger, buildThreads):

     listPackages = get_all_package_names(inputJSONFile)

     listPackagesToBuild=[]

@@ -226,7 +231,20 @@ def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger, buildThread

     logger.info("List of packages to build:")

     logger.info(listPackagesToBuild)

     pkgManager = PackageManager()

-    pkgManager.buildPackages(listPackagesToBuild, buildThreads)

+    pkgManager.buildPackages(listPackagesToBuild, listBuildOptionPackages, pkgBuildOptionFile, buildThreads)

+

+def get_packages_with_build_options(pkg_build_options_file):

+    packages = []

+    if os.path.exists(pkg_build_options_file):

+        jsonData = open(pkg_build_options_file)

+        pkg_build_option_json = json.load(jsonData, object_pairs_hook=collections.OrderedDict)

+        jsonData.close()

+        pkgs_sorted = pkg_build_option_json.items()

+        for pkg in pkgs_sorted:

+            p =  pkg[0].encode('utf-8')

+            packages.append(str(p))

+

+    return packages

 def get_all_package_names(build_install_option):

     base_path = os.path.dirname(build_install_option)