[yocto] [meta-oracle-java][PATCH v3] Update jdk and jre to version 67

Mon Sep 8 04:37:46 PDT 2014

Hi,

Manually merged this patch (There were some difficulties in applying
this patch directly - please take care of it next time). Thanks !

On Thu, Sep 04, 2014 at 04:18:00PM +0000, Vladimir Redzhepov wrote:
> From 61efb0099635325b21d589dd96308c7fa9b668de Mon Sep 17 00:00:00 2001
> From: Vladimir Redzhepov <vladimir_redzhepov at epam.com>
> Date: Thu, 4 Sep 2014 18:37:50 +0300
> Subject: [PATCH] Update jdk and jre to version 67.
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> 1. Add BUILD_NUMBER variable.
> 2. Change SRC_URI for all recipes.
> 3. Recipe cleanup - remove redundant PR = "r0" from all recipes.
> 4. Update checksums for license files.
> 
> Changes in COPYRIGHT:
> -Copyright � 1993, 2013, Oracle and/or its affiliates.
> +Copyright � 1993, 2014, Oracle and/or its affiliates.
> 
> Changes in THIRDPARTYLICENSEREADME.txt:
> +%% This notice is provided with respect to Sparkle v.1.5,
> +which is included with JRE 7 on Mac OS X.
> +
> +--- begin of LICENSE ---
> +
> +Copyright (c) 2012 Sparkle.org and Andy Matuschak
> +
> +Permission is hereby granted, free of charge, to any person obtaining a copy
> +of this software and associated documentation files (the "Software"), to deal
> +in the Software without restriction, including without limitation the rights
> +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> +copies of the Software, and to permit persons to whom the Software is
> +furnished to do so, subject to the following conditions:
> +
> +The above copyright notice and this permission notice shall be included in all
> +copies or substantial portions of the Software.
> +
> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> +SOFTWARE.
> +
> +--- end of LICENSE ---
> +
> +-------------------------------------------------------------------------------
> +
>  %% Portions licensed from Taligent, Inc.
> 
>  -------------------------------------------------------------------------------
>  %% This notice is provided with respect to the following which is
>  included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
> 
> -  Apache Derby 10.8.1.2        [included with JDK 7 only]
> +  Apache Derby 10.8.3.0        [included with JDK 7 only]
>    Apache Jakarta BCEL 5.2
>    Apache Jakarta Regexp 1.4
>    Apache Santuario XMLSec-Java 1.4.2
>    Apache Xalan-Java 2.7.1
> -  Apache Xerces2 Java 2.10.0
> +  Apache Xerces2 Java 2.11.0
>    Apache XML Resolver 1.1
> 
> Signed-off-by: Vladimir Redzhepov <vladimir_redzhepov at epam.com>
> ---
>  recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb   | 10 +++++-----
>  recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb | 10 +++++-----
>  recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb   | 10 +++++-----
>  recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb | 10 +++++-----
>  recipes-devtools/oracle-java/oracle-jse.inc                 |  4 ++--
>  5 files changed, 22 insertions(+), 22 deletions(-)
> 
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> index 978fbd5..0667161 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> @@ -1,9 +1,9 @@
> -PR = "r0"
> -PV_UPDATE = "25"
> +PV_UPDATE = "67"
> +BUILD_NUMBER = "01"
>  
>  require oracle-jse-jdk.inc
>  
> -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-i586.tar.gz"
> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_NUMBER}/jdk-7u${PV_UPDATE}-linux-i586.tar.gz"
>  
> -SRC_URI[md5sum] = "23176d0ebf9dedd21e3150b4bb0ee776"
> -SRC_URI[sha256sum] = "dd89b20afa939992bb7fdc44837fa64f0a98d7ee1e5706fe8a2d9e2247ba6de7"
> +SRC_URI[md5sum] = "715b0e8ba2a06bded75f6a92427e2701"
> +SRC_URI[sha256sum] = "b6231064ad2c9fbbcb099dba17b1dcf12033e922b9c24e4348b9a01e9ebaa85c"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> index 7979401..f18ce55 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> @@ -1,9 +1,9 @@
> -PR = "r0"
> -PV_UPDATE = "25"
> +PV_UPDATE = "67"
> +BUILD_NUMBER = "01"
>  
>  require oracle-jse-jdk.inc
>  
> -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-x64.tar.gz"
> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_NUMBER}/jdk-7u${PV_UPDATE}-linux-x64.tar.gz"
>  
> -SRC_URI[md5sum] = "83ba05e260813f7a9140b76e3d37ea33"
> -SRC_URI[sha256sum] = "f80dff0e19ca8d038cf7fe3aaa89538496b80950f4d10ff5f457988ae159b2a6"
> +SRC_URI[md5sum] = "81e3e2df33e13781e5fac5756ed90e67"
> +SRC_URI[sha256sum] = "54dd1e13edf18c64941a55da9c91210b53dc5cf48f1a8f4538c863049e346335"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb
> index 6125025..d0a9300 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb
> +++ b/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb
> @@ -1,9 +1,9 @@
> -PR = "r0"
> -PV_UPDATE = "25"
> +PV_UPDATE = "67"
> +BUILD_NUMBER = "01"
>  
>  require oracle-jse-jre.inc
>  
> -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jre-7u25-linux-i586.tar.gz"
> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_NUMBER}/jre-7u${PV_UPDATE}-linux-i586.tar.gz"
>  
> -SRC_URI[md5sum] = "0e9ccefe49e937e592dbb605f2e8e7d8"
> -SRC_URI[sha256sum] = "4016965536d8607743267812ab04e6d428036dda432893748c1df6cb77b09628"
> +SRC_URI[md5sum] = "2a256eb2a91f0084e58c612636342c2b"
> +SRC_URI[sha256sum] = "eadec83a54d3a9d09248a8d16b21c03da9afffc7317e775fb8db962620a0781d"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb
> index 4058d23..0d5f157 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb
> +++ b/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb
> @@ -1,9 +1,9 @@
> -PR = "r0"
> -PV_UPDATE = "25"
> +PV_UPDATE = "67"
> +BUILD_NUMBER = "01"
>  
>  require oracle-jse-jre.inc
>  
> -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jre-7u25-linux-x64.tar.gz"
> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_NUMBER}/jre-7u${PV_UPDATE}-linux-x64.tar.gz"
>  
> -SRC_URI[md5sum] = "743ee0ebf73ce428c912866d84e374e0"
> -SRC_URI[sha256sum] = "3c4496316fb413d5ab0590e9971676a521b9a600b3ceaac311f04c18c98a98c0"
> +SRC_URI[md5sum] = "9007c79167be0177fb47e5313c53d5cb"
> +SRC_URI[sha256sum] = "726c37c07bb389b5b96674b7bcbc288e39fb8fbcd42369afa364a18e66248b1f"
> diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc
> index 3a4e20d..38ceef0 100644
> --- a/recipes-devtools/oracle-java/oracle-jse.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse.inc
> @@ -2,8 +2,8 @@ LICENSE_FLAGS = "oracle_java"
>  LICENSE = "Oracle_Binary_Code_License_Agreement"
>  LIC_FILES_CHKSUM = "\
>  	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/LICENSE;md5=98f46ab6481d87c4d77e0e91a6dbc15f \
> -	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=3a11238025bf13b87f04753183ffeb90 \
> -	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=c339b34e3da6673d2c5950d0f8808f8c \
> +	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
> +	file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
>  	"
>  
>  FETCHCMD_wget_append = " --header=Cookie:oraclelicense=a "
> -- 
Thanks and Regards,
Maxin