@@ -41,6 +41,12 @@ else

 PHOTON_PUBLISH_RPMS := publish-rpms

 endif

+ifdef PHOTON_PUBLISH_XRPMS_PATH

+PHOTON_PUBLISH_XRPMS := publish-x-rpms-cached

+else

+PHOTON_PUBLISH_XRPMS := publish-x-rpms

+endif

+

 # Tri state RPMCHECK:

 # 1) RPMCHECK is not specified:  just build

 # 2) RPMCHECK=enable: build and run %check section. do not stop on error. will generate report file.

@@ -224,7 +230,7 @@ who-needs:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

 		$(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -i who-needs -p $(pkg)

-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

+packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

         $(PHOTON_PACKAGE_BUILDER) \

@@ -235,6 +241,7 @@ packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

+                -e $(PHOTON_PUBLISH_XRPMS_DIR) \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

@@ -244,7 +251,7 @@ packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $

                 $(PHOTON_RPMCHECK_FLAGS) \

                 -t ${THREADS}

-updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

+updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building only updated RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

         $(PHOTON_PACKAGE_BUILDER) \

@@ -254,6 +261,7 @@ updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SO

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

+                -e $(PHOTON_PUBLISH_XRPMS_DIR) \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

@@ -321,11 +329,21 @@ publish-rpms:

 	@cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \

 	$(PHOTON_PULL_PUBLISH_RPMS) $(PHOTON_PUBLISH_RPMS_DIR)

+publish-x-rpms:

+	@echo "Pulling publish X rpms from bintray..."

+	@cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \

+	$(PHOTON_PULL_PUBLISH_X_RPMS) $(PHOTON_PUBLISH_XRPMS_DIR)

+

 publish-rpms-cached:

 	@echo "Using cached publish rpms..."

 	@$(MKDIR) -p $(PHOTON_PUBLISH_RPMS_DIR) && \

 	 $(CP) -rf $(PHOTON_PUBLISH_RPMS_PATH)/* $(PHOTON_PUBLISH_RPMS_DIR)/

+publish-x-rpms-cached:

+	@echo "Using ..."

+	@$(MKDIR) -p $(PHOTON_PUBLISH_XRPMS_DIR) && \

+        $(CP) -rf $(PHOTON_PUBLISH_XRPMS_PATH)/* $(PHOTON_PUBLISH_XRPMS_DIR)/

+

 $(PHOTON_STAGE):

 	@echo "Creating staging folder..."

 	$(MKDIR) -p $(PHOTON_STAGE)

@@ -506,6 +524,7 @@ check: packages

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

+		-e $(PHOTON_PUBLISH_XRPMS_DIR) \

                 -c $(PHOTON_BINTRAY_CONFIG) \

                 -d $(PHOTON_DIST_TAG) \

                 -n $(PHOTON_BUILD_NUMBER) \

@@ -516,7 +535,7 @@ check: packages

                 $(rpmcheck_stop_on_error) \

                 -t ${THREADS}

-%: check-tools $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

+%: check-tools $(PHOTON_PUBLISH_RPMS) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_SOURCES) $(CONTAIN) $(eval PKG_NAME = $@)

 	$(eval PKG_NAME = $@)

 	@echo "Building package $(PKG_NAME) ..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

@@ -527,6 +546,7 @@ check: packages

                               -a $(PHOTON_SRPMS_DIR) \

                               -x $(PHOTON_SRCS_DIR) \

                               -p $(PHOTON_PUBLISH_RPMS_DIR) \

+			      -e $(PHOTON_PUBLISH_XRPMS_DIR) \

                               -c $(PHOTON_BINTRAY_CONFIG) \

                               -d $(PHOTON_DIST_TAG) \

                               -n $(PHOTON_BUILD_NUMBER) \

new file mode 100644

@@ -0,0 +1,433 @@

+--- a/jdk/src/share/back/invoker.c	Tue Mar 29 23:02:04 2016 +0100

+@@ -211,6 +211,47 @@

+     return error;

+ }

+ 

++/*

++ * Delete global references from the request which got put there before a

++ * invoke request was carried out. See fillInvokeRequest() and invoker invoke*()

++ * impls.

++ */

++static void

++deleteGlobalRefs(JNIEnv *env, InvokeRequest *request)

++{

++    void *cursor;

++    jint argIndex = 0;

++    jvalue *argument = request->arguments;

++    jbyte argumentTag = firstArgumentTypeTag(request->methodSignature, &cursor);

++

++    if (request->clazz != NULL) {

++        tossGlobalRef(env, &(request->clazz));

++    }

++    if (request->instance != NULL) {

++        tossGlobalRef(env, &(request->instance));

++    }

++    /* Delete global argument references */

++    while (argIndex < request->argumentCount) {

++        if ((argumentTag == JDWP_TAG(OBJECT)) ||

++            (argumentTag == JDWP_TAG(ARRAY))) {

++            if (argument->l != NULL) {

++                tossGlobalRef(env, &(argument->l));

++            }

++        }

++        argument++;

++        argIndex++;

++        argumentTag = nextArgumentTypeTag(&cursor);

++    }

++    /* Delete potentially saved return values */

++    if ((request->invokeType == INVOKE_CONSTRUCTOR) ||

++        (returnTypeTag(request->methodSignature) == JDWP_TAG(OBJECT)) ||

++        (returnTypeTag(request->methodSignature) == JDWP_TAG(ARRAY))) {

++        if (request->returnValue.l != NULL) {

++            tossGlobalRef(env, &(request->returnValue.l));

++        }

++    }

++}

++

+ static jvmtiError

+ fillInvokeRequest(JNIEnv *env, InvokeRequest *request,

+                   jbyte invokeType, jbyte options, jint id,

+@@ -736,6 +777,13 @@

+         (void)outStream_writeObjectRef(env, &out, exc);

+         outStream_sendReply(&out);

+     }

++

++    /*

++     * At this time, there's no need to retain global references on

++     * arguments since the reply is processed. No one will deal with

++     * this request ID anymore, so we must call deleteGlobalRefs().

++     */

++    deleteGlobalRefs(env, request);

+ }

+ 

+ jboolean

+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

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

++-Xmx40m

+\ No newline at end of file

+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

+@@ -0,0 +1,312 @@

++/*

++ * Copyright (c) 2016 Red Hat Inc.

++ *

++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

++ *

++ * This code is free software; you can redistribute it and/or modify it

++ * under the terms of the GNU General Public License version 2 only, as

++ * published by the Free Software Foundation.

++ *

++ * This code is distributed in the hope that it will be useful, but WITHOUT

++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

++ * version 2 for more details (a copy is included in the LICENSE file that

++ * accompanied this code).

++ *

++ * You should have received a copy of the GNU General Public License version

++ * 2 along with this work; if not, write to the Free Software Foundation,

++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

++ *

++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA

++ * or visit www.oracle.com if you need additional information or have any

++ * questions.

++ */

++

++/**

++ *  @test

++ *  @bug 4858370

++ *  @summary JDWP: Memory Leak (global references not deleted after invokeMethod).

++ *

++ *  @author Severin Gehwolf <sgehwolf@redhat.com>

++ *

++ *  @library ..

++ *  @run build TestScaffold VMConnection TargetListener TargetAdapter

++ *  @run compile -g OomDebugTest.java

++ *  @run shell OomDebugTestSetup.sh

++ *  @run main OomDebugTest OomDebugTestTarget test1

++ *  @run main OomDebugTest OomDebugTestTarget test2

++ *  @run main OomDebugTest OomDebugTestTarget test3

++ *  @run main OomDebugTest OomDebugTestTarget test4

++ *  @run main OomDebugTest OomDebugTestTarget test5

++ */

++import java.util.ArrayList;

++import java.util.Collections;

++import java.util.List;

++

++import com.sun.jdi.ArrayReference;

++import com.sun.jdi.ArrayType;

++import com.sun.jdi.ClassType;

++import com.sun.jdi.Field;

++import com.sun.jdi.InvocationException;

++import com.sun.jdi.Method;

++import com.sun.jdi.ObjectReference;

++import com.sun.jdi.ReferenceType;

++import com.sun.jdi.StackFrame;

++import com.sun.jdi.VMOutOfMemoryException;

++import com.sun.jdi.Value;

++import com.sun.jdi.event.BreakpointEvent;

++

++/***************** Target program **********************/

++

++class OomDebugTestTarget {

++

++    OomDebugTestTarget() {

++        System.out.println("DEBUG: invoked constructor");

++    }

++    static class FooCls {

++        @SuppressWarnings("unused")

++        private byte[] bytes = new byte[3000000];

++    };

++

++    FooCls fooCls = new FooCls();

++    byte[] byteArray = new byte[0];

++

++    void testMethod(FooCls foo) {

++        System.out.println("DEBUG: invoked 'void testMethod(FooCls)', foo == " + foo);

++    }

++

++    void testPrimitive(byte[] foo) {

++        System.out.println("DEBUG: invoked 'void testPrimitive(byte[])', foo == " + foo);

++    }

++

++    byte[] testPrimitiveArrRetval() {

++        System.out.println("DEBUG: invoked 'byte[] testPrimitiveArrRetval()'");

++        return new byte[3000000];

++    }

++

++    FooCls testFooClsRetval() {

++        System.out.println("DEBUG: invoked 'FooCls testFooClsRetval()'");

++        return new FooCls();

++    }

++

++    public void entry() {}

++

++    public static void main(String[] args){

++        System.out.println("DEBUG: OomDebugTestTarget.main");

++        new OomDebugTestTarget().entry();

++    }

++}

++

++/***************** Test program ************************/

++

++public class OomDebugTest extends TestScaffold {

++

++    private static final int TOTAL_TESTS = 1;

++    private ReferenceType targetClass;

++    private ObjectReference thisObject;

++    private int failedTests;

++    private final String testMethodName;

++

++    public OomDebugTest(String[] args) {

++        super(args);

++        if (args.length != 2) {

++            throw new RuntimeException("Test failed unexpectedly.");

++        }

++        testMethodName = args[1];

++    }

++

++    @Override

++    protected void runTests() throws Exception {

++        try {

++            /*

++             * Get to the top of entry()

++             * to determine targetClass and mainThread

++             */

++            BreakpointEvent bpe = startTo("OomDebugTestTarget", "entry", "()V");

++            targetClass = bpe.location().declaringType();

++

++            mainThread = bpe.thread();

++

++            StackFrame frame = mainThread.frame(0);

++            thisObject = frame.thisObject();

++            java.lang.reflect.Method m = findTestMethod();

++            m.invoke(this);

++        } catch (NoSuchMethodException e) {

++            e.printStackTrace();

++            failure();

++        } catch (SecurityException e) {

++            e.printStackTrace();

++            failure();

++        }

++    }

++

++    private java.lang.reflect.Method findTestMethod()

++            throws NoSuchMethodException, SecurityException {

++        return OomDebugTest.class.getDeclaredMethod(testMethodName);

++    }

++

++    private void failure() {

++        failedTests++;

++    }

++

++    /*

++     * Test case: Object reference as method parameter.

++     */

++    @SuppressWarnings("unused") // called via reflection

++    private void test1() throws Exception {

++        System.out.println("DEBUG: ------------> Running " + testMethodName);

++        try {

++            Field field = targetClass.fieldByName("fooCls");

++            ClassType clsType = (ClassType)field.type();

++            Method constructor = getConstructorForClass(clsType);

++            for (int i = 0; i < 15; i++) {

++                @SuppressWarnings({ "rawtypes", "unchecked" })

++                ObjectReference objRef = clsType.newInstance(mainThread,

++                                                             constructor,

++                                                             new ArrayList(0),

++                                                             ObjectReference.INVOKE_NONVIRTUAL);

++                invoke("testMethod", "(LOomDebugTestTarget$FooCls;)V", objRef);

++            }

++        } catch (InvocationException e) {

++            handleFailure(e);

++        }

++    }

++

++    /*

++     * Test case: Array reference as method parameter.

++     */

++    @SuppressWarnings("unused") // called via reflection

++    private void test2() throws Exception {

++        System.out.println("DEBUG: ------------> Running " + testMethodName);

++        try {

++            Field field = targetClass.fieldByName("byteArray");

++            ArrayType arrType = (ArrayType)field.type();

++

++            for (int i = 0; i < 15; i++) {

++                ArrayReference byteArrayVal = arrType.newInstance(3000000);

++                invoke("testPrimitive", "([B)V", byteArrayVal);

++            }

++        } catch (VMOutOfMemoryException e) {

++            defaultHandleOOMFailure(e);

++        }

++    }

++

++    /*

++     * Test case: Array reference as return value.

++     */

++    @SuppressWarnings("unused") // called via reflection

++    private void test3() throws Exception {

++        System.out.println("DEBUG: ------------> Running " + testMethodName);

++        try {

++            for (int i = 0; i < 15; i++) {

++                invoke("testPrimitiveArrRetval",

++                       "()[B",

++                       Collections.EMPTY_LIST,

++                       vm().mirrorOfVoid());

++            }

++        } catch (InvocationException e) {

++            handleFailure(e);

++        }

++    }

++

++    /*

++     * Test case: Object reference as return value.

++     */

++    @SuppressWarnings("unused") // called via reflection

++    private void test4() throws Exception {

++        System.out.println("DEBUG: ------------> Running " + testMethodName);

++        try {

++            for (int i = 0; i < 15; i++) {

++                invoke("testFooClsRetval",

++                       "()LOomDebugTestTarget$FooCls;",

++                       Collections.EMPTY_LIST,

++                       vm().mirrorOfVoid());

++            }

++        } catch (InvocationException e) {

++            handleFailure(e);

++        }

++    }

++

++    /*

++     * Test case: Constructor

++     */

++    @SuppressWarnings({ "unused", "unchecked", "rawtypes" }) // called via reflection

++    private void test5() throws Exception {

++        System.out.println("DEBUG: ------------> Running " + testMethodName);

++        try {

++            ClassType type = (ClassType)thisObject.type();

++            for (int i = 0; i < 15; i++) {

++                type.newInstance(mainThread,

++                                 findMethod(targetClass, "<init>", "()V"),

++                                 new ArrayList(0),

++                                 ObjectReference.INVOKE_NONVIRTUAL);

++            }

++        } catch (InvocationException e) {

++            handleFailure(e);

++        }

++    }

++

++    private Method getConstructorForClass(ClassType clsType) {

++        List<Method> methods = clsType.methodsByName("<init>");

++        if (methods.size() != 1) {

++            throw new RuntimeException("FAIL. Expected only one, the default, constructor");

++        }

++        return methods.get(0);

++    }

++

++    private void handleFailure(InvocationException e) {

++        // There is no good way to see the OOME diagnostic message in the target since the

++        // TestScaffold might throw an exception while trying to print the stack trace. I.e

++        // it might get a a VMDisconnectedException before the stack trace printing finishes.

++        System.err.println("FAILURE: InvocationException caused by OOM");

++        defaultHandleOOMFailure(e);

++    }

++

++    private void defaultHandleOOMFailure(Exception e) {

++        e.printStackTrace();

++        failure();

++    }

++

++    @SuppressWarnings({ "rawtypes", "unchecked" })

++    void invoke(String methodName, String methodSig, Value value)

++            throws Exception {

++        List args = new ArrayList(1);

++        args.add(value);

++        invoke(methodName, methodSig, args, value);

++    }

++

++    void invoke(String methodName,

++                String methodSig,

++                @SuppressWarnings("rawtypes") List args,

++                Value value) throws Exception {

++        Method method = findMethod(targetClass, methodName, methodSig);

++        if ( method == null) {

++            failure("FAILED: Can't find method: "

++                    + methodName  + " for class = " + targetClass);

++            return;

++        }

++        invoke(method, args, value);

++    }

++

++    @SuppressWarnings({ "rawtypes", "unchecked" })

++    void invoke(Method method, List args, Value value) throws Exception {

++        thisObject.invokeMethod(mainThread, method, args, 0);

++        System.out.println("DEBUG: Done invoking method via debugger.");

++    }

++

++    Value fieldValue(String fieldName) {

++        Field field = targetClass.fieldByName(fieldName);

++        return thisObject.getValue(field);

++    }

++

++    public static void main(String[] args) throws Exception {

++        OomDebugTest oomTest = new OomDebugTest(args);

++        oomTest.startTests();

++        if (oomTest.failedTests > 0) {

++            throw new RuntimeException(oomTest.failedTests

++                                       + " of " + TOTAL_TESTS + " test(s) failed.");

++        }

++        System.out.println("All " + TOTAL_TESTS + " tests passed.");

++    }

++

++}

+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

+@@ -0,0 +1,46 @@

++#!/bin/sh

++#

++# Copyright (c) 2016 Red Hat Inc.

++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

++#

++# This code is free software; you can redistribute it and/or modify it

++# under the terms of the GNU General Public License version 2 only, as

++# published by the Free Software Foundation.

++#

++# This code is distributed in the hope that it will be useful, but WITHOUT

++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

++# version 2 for more details (a copy is included in the LICENSE file that

++# accompanied this code).

++#

++# You should have received a copy of the GNU General Public License version

++# 2 along with this work; if not, write to the Free Software Foundation,

++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

++#

++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA

++# or visit www.oracle.com if you need additional information or have any

++# questions.

++#

++

++

++if [ "${TESTSRC}" = "" ]

++then

++  echo "TESTSRC not set.  Test cannot execute.  Failed."

++  exit 1

++fi

++echo "TESTSRC=${TESTSRC}"

++

++if [ "${TESTJAVA}" = "" ]

++then

++  echo "TESTJAVA not set.  Test cannot execute.  Failed."

++  exit 1

++fi

++echo "TESTJAVA=${TESTJAVA}"

++

++if [ "${TESTCLASSES}" = "" ]

++then

++  echo "TESTCLASSES not set.  Test cannot execute.  Failed."

++  exit 1

++fi

++

++cp ${TESTSRC}/@debuggeeVMOptions ${TESTCLASSES}/

new file mode 100644

@@ -0,0 +1,53 @@

+diff -r 6b81fd2227d1 -r 3334efeacd83 src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java

+--- a/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	Fri Apr 01 05:33:37 2016 +0100

+@@ -174,15 +174,20 @@

+                     storeFile = new File(storeFileName);

+                     fis = getFileInputStream(storeFile);

+                 } else {

+-                    String javaHome = props.get("javaHome");

+-                    storeFile = new File(javaHome + sep + "lib" + sep

+-                                                    + "security" + sep +

+-                                                    "jssecacerts");

++                    /* Check system cacerts DB first; /etc/pki/java/cacerts */

++                    storeFile = new File(sep + "etc" + sep + "pki" + sep

++                                         + "java" + sep + "cacerts");

+                     if ((fis = getFileInputStream(storeFile)) == null) {

++                        String javaHome = props.get("javaHome");

+                         storeFile = new File(javaHome + sep + "lib" + sep

+-                                                    + "security" + sep +

+-                                                    "cacerts");

+-                        fis = getFileInputStream(storeFile);

++                                             + "security" + sep +

++                                             "jssecacerts");

++                        if ((fis = getFileInputStream(storeFile)) == null) {

++                            storeFile = new File(javaHome + sep + "lib" + sep

++                                                 + "security" + sep +

++                                                 "cacerts");

++                            fis = getFileInputStream(storeFile);

++                        }

+                     }

+                 }

+ 

+diff -r 6b81fd2227d1 -r 3334efeacd83 src/share/classes/sun/security/tools/KeyStoreUtil.java

+--- a/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java	Fri Apr 01 05:33:37 2016 +0100

+@@ -87,9 +87,14 @@

+         throws Exception

+     {

+         String sep = File.separator;

+-        File file = new File(System.getProperty("java.home") + sep

+-                             + "lib" + sep + "security" + sep

+-                             + "cacerts");

++        /* Check system cacerts DB first; /etc/pki/java/cacerts */

++        File file = new File(sep + "etc" + sep + "pki" + sep

++                             + "java" + sep + "cacerts");

++        if (!file.exists()) {

++            file = new File(System.getProperty("java.home") + sep

++                            + "lib" + sep + "security" + sep

++                            + "cacerts");

++        }

+         if (!file.exists()) {

+             return null;

+         }

+

new file mode 100644

@@ -0,0 +1,11 @@

+--- a/jdk/make/CompileNativeLibraries.gmk       2017-04-07 20:06:07.668018356 +0000

+@@ -83,7 +83,7 @@

+

+ include lib/ServiceabilityLibraries.gmk

+

+-include lib/Awt2dLibraries.gmk

++#include lib/Awt2dLibraries.gmk

+

+ include lib/SoundLibraries.gmk

+

new file mode 100644

@@ -0,0 +1,13 @@

+diff --git a/src/share/native/sun/java2d/cmm/lcms/cmstypes.c b/src/share/native/sun/java2d/cmm/lcms/cmstypes.c

+--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c

+@@ -1483,7 +1483,7 @@

+         if (!_cmsReadUInt32Number(io, &Offset)) goto Error;

+ 

+         // Check for overflow

+-        if (Offset < (SizeOfHeader + 8)) goto Error;

++        if ((Offset + Len) > SizeOfTag + :sunglasses: goto Error;

+ 

+         // True begin of the string

+         BeginOfThisString = Offset - SizeOfHeader - 8;

+

@@ -1,18 +1,30 @@

 %define _use_internal_dependency_generator 0

+%global security_hardening none

 Summary:	OpenJDK 

 Name:		openjdk

-Version:	1.8.0.112

-Release:	2%{?dist}

+Version:	1.8.0.131

+Release:	1%{?dist}

 License:	GNU GPL

 URL:		https://openjdk.java.net

 Group:		Development/Tools

 Vendor:		VMware, Inc.

 Distribution:   Photon

-Source0:	http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK/OpenJDK-%{version}-x86_64-bin.tar.xz

-%define sha1 OpenJDK=c14a20158e16a8877940cfa6dbdf0900d4099a4a

-Source1:        macros.java

+Source0:	http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK/openjdk-%{version}.tar.bz2

+%define sha1 openjdk=ae01c24fe5247d5aa246a60c0272ba92188a7d55

+Source1:    macros.java

+Patch0:		disable-awt-lib.patch

+Patch1:		fix-lcms.patch 

+Patch2:		Fix-memory-leak.patch

+Patch3:		check-system-ca-certs.patch

+BuildRequires:  pcre-devel

+BuildRequires:	which

+BuildRequires:	zip

+BuildRequires:	unzip

+BuildRequires:  zlib-devel

+BuildRequires:	ca-certificates

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

 AutoReqProv: 	no

+%define bootstrapjdkversion 1.8.0.112

 %description

 The OpenJDK package installs java class library and javac java compiler. 

@@ -46,16 +58,52 @@ This package provides the runtime library class sources.

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

 %prep -p exit

-%setup -qn OpenJDK-%{version}-x86_64-bin

+%setup -q -n openjdk

+%patch0 -p1

+%patch1 -p1

+%patch2 -p1

+%patch3 -p1

+

 %build

+chmod a+x ./configure

+unset JAVA_HOME &&

+./configure \

+	FREETYPE_NOT_NEEDED=yes \

+	CUPS_NOT_NEEDED=yes \

+	--with-target-bits=64 \

+	--with-boot-jdk=/var/opt/OpenJDK-%bootstrapjdkversion-bin \

+	--enable-headful=no \

+	--with-cacerts-file=/var/opt/OpenJDK-%bootstrapjdkversion-bin/jre/lib/security/cacerts \

+	--with-extra-cxxflags="-Wno-error -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" \

+	--with-extra-cflags="-std=gnu++98 -fno-delete-null-pointer-checks -Wno-error -fno-lifetime-dse" \

+	--with-stdc++lib=dynamic

+

+make \

+    DEBUG_BINARIES=true \

+    BUILD_HEADLESS_ONLY=yes \

+    OPENJDK_TARGET_OS=linux \

+    JAVAC_FLAGS=-g \

+    STRIP_POLICY=no_strip \

+    DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \

+    CLASSPATH=/var/opt/OpenJDK-%bootstrapjdkversion-bin/jre \

+    POST_STRIP_CMD="" \

+    LOG=trace \

+    SCTP_WERROR=

 %install

+make DESTDIR=%{buildroot} install \

+	BUILD_HEADLESS_ONLY=yes \

+	OPENJDK_TARGET_OS=linux \

+	DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \

+	CLASSPATH=/var/opt/OpenJDK-%bootstrapjdkversion-bin/jre

+

+install -vdm755 %{buildroot}/var/opt/OpenJDK-%{version}-bin

+chown -R root:root %{buildroot}/var/opt/OpenJDK-%{version}-bin

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

 install -vdm755 %{buildroot}%{_rpmconfigdir}/macros.d

 install -m 644 %{SOURCE1} %{buildroot}/%{_rpmconfigdir}/macros.d/

-install -vdm755 %{buildroot}/var/opt/OpenJDK-%{version}-bin 

-mv -v %{_builddir}/OpenJDK-%{version}-x86_64-bin/* %{buildroot}/var/opt/OpenJDK-%{version}-bin/         

-chown -R root:root %{buildroot}/var/opt/OpenJDK-%{version}-bin

 install -vdm644 %{buildroot}/etc/profile.d

+mv /usr/local/jvm/openjdk-1.8.0-internal/* %{buildroot}/var/opt/OpenJDK-%{version}-bin/

 cat >> %{buildroot}/etc/profile.d/java-exports.sh <<- "EOF"

 export CLASSPATH=.:/usr/share/java

@@ -63,6 +111,11 @@ export JAVA_HOME=/var/opt/OpenJDK-%{version}-bin

 export PATH="$PATH:/var/opt/OpenJDK-%{version}-bin/bin:/var/opt/OpenJDK-%{version}-bin/jre/bin"

 EOF

+chmod a+x %{buildroot}/etc/profile.d/java-exports.sh

+

+%post

+source /etc/profile.d/java-exports.sh

+

 %clean

 rm -rf %{buildroot}/*

@@ -74,7 +127,6 @@ rm -rf %{buildroot}/*

 /var/opt/OpenJDK-%{version}-bin/THIRD_PARTY_README

 /var/opt/OpenJDK-%{version}-bin/lib

 /var/opt/OpenJDK-%{version}-bin/include/

-/var/opt/OpenJDK-%{version}-bin/bin/appletviewer

 /var/opt/OpenJDK-%{version}-bin/bin/extcheck

 /var/opt/OpenJDK-%{version}-bin/bin/idlj

 /var/opt/OpenJDK-%{version}-bin/bin/jar

@@ -98,7 +150,6 @@ rm -rf %{buildroot}/*

 /var/opt/OpenJDK-%{version}-bin/bin/jstack

 /var/opt/OpenJDK-%{version}-bin/bin/jstat

 /var/opt/OpenJDK-%{version}-bin/bin/jstatd

-/var/opt/OpenJDK-%{version}-bin/bin/mkcacerts

 /var/opt/OpenJDK-%{version}-bin/bin/native2ascii

 /var/opt/OpenJDK-%{version}-bin/bin/rmic

 /var/opt/OpenJDK-%{version}-bin/bin/schemagen

@@ -116,7 +167,6 @@ rm -rf %{buildroot}/*

 /var/opt/OpenJDK-%{version}-bin/bin/keytool

 /var/opt/OpenJDK-%{version}-bin/bin/orbd

 /var/opt/OpenJDK-%{version}-bin/bin/pack200

-/var/opt/OpenJDK-%{version}-bin/bin/policytool

 /var/opt/OpenJDK-%{version}-bin/bin/rmid

 /var/opt/OpenJDK-%{version}-bin/bin/rmiregistry

 /var/opt/OpenJDK-%{version}-bin/bin/servertool

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

 /var/opt/OpenJDK-%{version}-bin/src.zip

 %changelog

+*	Mon Apr 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.131-1

+-	Upgraded to version 1.8.0.131 and building Java from sources

 *       Tue Mar 28 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.112-2

 -       add java rpm macros

 *       Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.112-1

@@ -28,6 +28,7 @@ PHOTON_COMMON_DIR?=$(SRCROOT)/common

 PHOTON_DATA_DIR?=$(PHOTON_COMMON_DIR)/data

 PHOTON_SRCS_DIR=$(PHOTON_STAGE)/SOURCES

 PHOTON_PUBLISH_RPMS_DIR=$(PHOTON_STAGE)/PUBLISHRPMS

+PHOTON_PUBLISH_XRPMS_DIR=$(PHOTON_STAGE)/PUBLISHXRPMS

 PHOTON_GENERATED_DATA_DIR=$(PHOTON_STAGE)/common/data

 PHOTON_PKG_BUILDER_DIR=$(SRCROOT)/support/package-builder

@@ -41,6 +42,7 @@ PHOTON_SPECDEPS=$(PHOTON_SPECDEPS_DIR)/SpecDeps.py

 PHOTON_PACKAGE_BUILDER=$(PHOTON_PKG_BUILDER_DIR)/builder.py

 PHOTON_BINTRAY_CONFIG?=$(PHOTON_PKG_BUILDER_DIR)/pullsources.conf

 PHOTON_PULL_PUBLISH_RPMS=$(PHOTON_PULL_PUBLISH_RPMS_DIR)/pullpublishrpms.sh

+PHOTON_PULL_PUBLISH_X_RPMS=$(PHOTON_PULL_PUBLISH_RPMS_DIR)/pullpublishXrpms.sh

 PHOTON_CLOUD_IMAGE_BUILDER=$(PHOTON_CLOUD_IMAGE_BUILDER_DIR)/cloud-image-build.sh

 PHOTON_CHROOT_CLEANER=$(PHOTON_PKG_BUILDER_DIR)/clean-up-chroot.py

@@ -23,7 +23,7 @@ class PackageBuilder(object):

         self.listBuildOptionPackages=listBuildOptionPackages

         self.pkgBuildOptionFile=pkgBuildOptionFile

-    def prepareBuildRoot(self,chrootName):

+    def prepareBuildRoot(self,chrootName, packageName):

         chrootID=None

         try:

             chrUtils = ChrootUtils(self.logName,self.logPath)

@@ -32,7 +32,7 @@ class PackageBuilder(object):

             if not returnVal:

                 raise Exception("Unable to prepare build root")

             tUtils=ToolChainUtils(self.logName,self.logPath)

-            tUtils.installToolChainRPMS(chrootID)

+            tUtils.installToolChainRPMS(chrootID, packageName)

         except Exception as e:

             if chrootID is not None:

                 self.logger.debug("Deleting chroot: " + chrootID)

@@ -99,7 +99,7 @@ class PackageBuilder(object):

         chrootName="build-"+package

         chrootID=None

         try:

-            chrootID = self.prepareBuildRoot(chrootName)

+            chrootID = self.prepareBuildRoot(chrootName, package)

             destLogPath=constants.logPath+"/build-"+package

             if not os.path.isdir(destLogPath):

                 cmdUtils = CommandUtils()

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

                 if not returnVal:

                     self.logger.error("Creating chroot failed")

                     raise Exception("creating chroot failed")

-                self.installToolChainRPMS(chrootID)

+                self.installToolChainRPMS(chrootID, package)

                 pkgUtils.adjustGCCSpecs(package, chrootID, destLogPath)

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

                 chrUtils.destroyChroot(chrootID)

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

             traceback.print_exc()

             raise e

-    def installToolChainRPMS(self,chrootID):

+    def installToolChainRPMS(self,chrootID, packageName):

         cmdUtils = CommandUtils()

         self.prepareBuildRoot(chrootID)

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

@@ -136,6 +136,30 @@ class ToolChainUtils(object):

         if retval != 0:

             self.logger.error("Installing tool chain  failed")

             raise Exception("RPM installation failed")

-            

-        self.logger.info("Successfully installed all Tool Chain RPMS in Chroot:"+chrootID)    

-    

+        self.logger.info("Successfully installed all Tool Chain RPMS in Chroot:"+chrootID)

+        if "openjdk" in packageName or "openjre" in packageName:

+            self.installToolChainXRPMS(chrootID);

+   

+    def installToolChainXRPMS(self, chrootID):

+        self.logger.info("Installing Tool Chain X package RPMS.......")

+        rpmFiles = ""

+        packages = ""

+        for package in constants.listToolChainXRPMsToInstall:

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

+	    print "DEBUG:" + package

+            rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishXRPMRepo)

+            if rpmFile is None:

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

+                raise Exception("Input Error")

+            rpmFiles += " " + rpmFile

+            packages += " " + package

+

+        self.logger.debug("Installing rpms:"+packages)

+	cmd=self.rpmCommand + " -i --nodeps --force --root "+chrootID+" --define \'_dbpath /var/lib/rpm\' "+ rpmFiles

+	print "Command Executed:" + cmd 

+        process = subprocess.Popen("%s" %cmd,shell=True,stdout=subprocess.PIPE)

+        retval = process.wait()

+        if retval != 0:

+            self.logger.error("Installing tool chain  failed")

+            raise Exception("RPM installation failed")

+        self.logger.info("Successfully installed all Tool Chain X RPMS")

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

     parser.add_argument("-r",  "--rpm-path",  dest="rpmPath",  default="../../stage/RPMS")

     parser.add_argument("-i",  "--install-package", dest="installPackage",  default=False,  action ="store_true")

     parser.add_argument("-p",  "--publish-RPMS-path", dest="publishRPMSPath",  default="../../stage/PUBLISHRPMS")

+    parser.add_argument("-e",  "--publish-XRPMS-path", dest="publishXRPMSPath",  default="../../stage/PUBLISHXRPMS")

     parser.add_argument("-l",  "--log-path", dest="logPath",  default="../../stage/LOGS")

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

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

@@ -58,18 +59,26 @@ def main():

     if not os.path.isdir(options.publishRPMSPath):

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

         errorFlag = True

+    if not os.path.isdir(options.publishXRPMSPath):

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

+        errorFlag = True

     if not os.path.isdir(options.publishRPMSPath+"/x86_64"):

         logger.error("Given RPMS Path is missing x86_64 sub-directory:"+options.publishRPMSPath)

         errorFlag = True

+    if not os.path.isdir(options.publishXRPMSPath+"/x86_64"):

+        logger.error("Given X RPMS Path is missing x86_64 sub-directory:"+options.publishXRPMSPath)

+        errorFlag = True

     if not os.path.isdir(options.publishRPMSPath+"/noarch"):

         logger.error("Given RPMS Path is missing noarch sub-directory:"+options.publishRPMSPath)

         errorFlag = True

-

+    if not os.path.isdir(options.publishXRPMSPath+"/noarch"):

+        logger.error("Given X RPMS Path is missing noarch sub-directory:"+options.publishXRPMSPath)

+        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)

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

         errorFlag = True

     if options.installPackage :

@@ -100,6 +109,7 @@ def main():

     logger.info("Log Path :" + options.logPath)

     logger.info("Top Dir Path :" + options.topDirPath)