Compare commits
No commits in common. "c9s" and "c8s" have entirely different histories.
19
.gitignore
vendored
19
.gitignore
vendored
@ -7,22 +7,3 @@
|
|||||||
/openjdk-jdk19u-jdk-19+36.tar.xz
|
/openjdk-jdk19u-jdk-19+36.tar.xz
|
||||||
/openjdk-jdk19u-jdk-19.0.1+10.tar.xz
|
/openjdk-jdk19u-jdk-19.0.1+10.tar.xz
|
||||||
/openjdk-jdk19u-jdk-19.0.2+7.tar.xz
|
/openjdk-jdk19u-jdk-19.0.2+7.tar.xz
|
||||||
/openjdk-jdk20u-jdk-20+36.tar.xz
|
|
||||||
/openjdk-jdk20u-jdk-20.0.1+9.tar.xz
|
|
||||||
/openjdk-jdk20u-jdk-20.0.2+9.tar.xz
|
|
||||||
/openjdk-jdk21u-jdk-21+35.tar.xz
|
|
||||||
/openjdk-21.0.1+12.tar.xz
|
|
||||||
/openjdk-21.0.2+11.tar.xz
|
|
||||||
/openjdk-21.0.2+12.tar.xz
|
|
||||||
/openjdk-21.0.2+13.tar.xz
|
|
||||||
/openjdk-21.0.3+1-ea.tar.xz
|
|
||||||
/openjdk-21.0.3+7-ea.tar.xz
|
|
||||||
/openjdk-21.0.3+9.tar.xz
|
|
||||||
/openjdk-21.0.4+1-ea.tar.xz
|
|
||||||
/openjdk-21.0.4+5-ea.tar.xz
|
|
||||||
/openjdk-21.0.4+7.tar.xz
|
|
||||||
/openjdk-21.0.5+1-ea.tar.xz
|
|
||||||
/openjdk-21.0.5+5-ea.tar.xz
|
|
||||||
/openjdk-21.0.5+9-ea.tar.xz
|
|
||||||
/openjdk-21.0.5+10.tar.xz
|
|
||||||
/openjdk-21.0.5+11.tar.xz
|
|
||||||
|
|||||||
32
README.md
32
README.md
@ -1,12 +1,14 @@
|
|||||||
OpenJDK 21 is the latest Long-Term Support (LTS) release of the Java platform.
|
OpenJDK 17 is the latest Long-Term Support (LTS) release of the Java platform.
|
||||||
|
|
||||||
For a list of major changes from OpenJDK 17 (java-17-openjdk), see the upstream
|
For a list of major changes from OpenJDK 11 (java-11-openjdk), see the upstream
|
||||||
release page for OpenJDK 21 and the preceding interim releases:
|
release page for OpenJDK 17 and the preceding interim releases:
|
||||||
|
|
||||||
* 18: https://openjdk.java.net/projects/jdk/18/
|
* 12: https://openjdk.java.net/projects/jdk/12/
|
||||||
* 19: https://openjdk.java.net/projects/jdk/19/
|
* 13: https://openjdk.java.net/projects/jdk/13/
|
||||||
* 20: https://openjdk.java.net/projects/jdk/20/
|
* 14: https://openjdk.java.net/projects/jdk/14/
|
||||||
* 21: https://openjdk.java.net/projects/jdk/21/
|
* 15: https://openjdk.java.net/projects/jdk/15/
|
||||||
|
* 16: https://openjdk.java.net/projects/jdk/16/
|
||||||
|
* 17: https://openjdk.java.net/projects/jdk/17/
|
||||||
|
|
||||||
# Rebuilding the OpenJDK package
|
# Rebuilding the OpenJDK package
|
||||||
|
|
||||||
@ -18,21 +20,21 @@ multiple builds which only differ by the platform they were built on.
|
|||||||
|
|
||||||
This does make rebuilding the package slightly more complicated than a
|
This does make rebuilding the package slightly more complicated than a
|
||||||
normal package. Modifications should be made to the
|
normal package. Modifications should be made to the
|
||||||
`java-21-openjdk-portable.specfile` file, which can be found with this
|
`java-17-openjdk-portable.specfile` file, which can be found with this
|
||||||
README file in the source RPM or installed in the documentation tree
|
README file in the source RPM or installed in the documentation tree
|
||||||
by the `java-21-openjdk-headless` RPM.
|
by the `java-17-openjdk-headless` RPM.
|
||||||
|
|
||||||
Once the modified `java-21-openjdk-portable` RPMs are built, they
|
Once the modified `java-17-openjdk-portable` RPMs are built, they
|
||||||
should be installed and will produce a number of tarballs in the
|
should be installed and will produce a number of tarballs in the
|
||||||
`/usr/lib/jvm` directory. The `java-21-openjdk` RPMs can then be
|
`/usr/lib/jvm` directory. The `java-17-openjdk` RPMs can then be
|
||||||
built, which will use these tarballs to create the usual RPMs found in
|
built, which will use these tarballs to create the usual RPMs found in
|
||||||
RHEL. The `java-21-openjdk-portable` RPMs can be uninstalled once the
|
RHEL. The `java-17-openjdk-portable` RPMs can be uninstalled once the
|
||||||
desired final RPMs are produced.
|
desired final RPMs are produced.
|
||||||
|
|
||||||
Note that the `java-21-openjdk.spec` file has a hard requirement on
|
Note that the `java-17-openjdk.spec` file has a hard requirement on
|
||||||
the exact version of java-21-openjdk-portable to use, so this will
|
the exact version of java-17-openjdk-portable to use, so this will
|
||||||
need to be modified if the version or rpmrelease values are changed in
|
need to be modified if the version or rpmrelease values are changed in
|
||||||
`java-21-openjdk-portable.specfile`.
|
`java-17-openjdk-portable.specfile`.
|
||||||
|
|
||||||
To reduce the number of RPMs involved, the `fastdebug` and `slowdebug`
|
To reduce the number of RPMs involved, the `fastdebug` and `slowdebug`
|
||||||
builds may be disabled using `--without fastdebug` and `--without
|
builds may be disabled using `--without fastdebug` and `--without
|
||||||
|
|||||||
@ -52,7 +52,7 @@ public class TestTranslations {
|
|||||||
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
|
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
|
||||||
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
|
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
|
||||||
"heure des Rocheuses", "UTC\u221207:00", "MT"});
|
"heure des Rocheuses", "UTC\u221207:00", "MT"});
|
||||||
map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
|
map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
|
||||||
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
|
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
|
||||||
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
|
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
|
||||||
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
|
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
|
||||||
|
|||||||
100
alt-java.c
100
alt-java.c
@ -1,100 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2023 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. Red Hat designates this
|
|
||||||
* particular file as subject to the "Classpath" exception as provided
|
|
||||||
* by Red Hat in the LICENSE file that accompanied this code.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <libgen.h>
|
|
||||||
#include <linux/limits.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sys/prctl.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
/* Per task speculation control */
|
|
||||||
#ifndef PR_GET_SPECULATION_CTRL
|
|
||||||
# define PR_GET_SPECULATION_CTRL 52
|
|
||||||
#endif
|
|
||||||
#ifndef PR_SET_SPECULATION_CTRL
|
|
||||||
# define PR_SET_SPECULATION_CTRL 53
|
|
||||||
#endif
|
|
||||||
/* Speculation control variants */
|
|
||||||
#ifndef PR_SPEC_STORE_BYPASS
|
|
||||||
# define PR_SPEC_STORE_BYPASS 0
|
|
||||||
#endif
|
|
||||||
/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
|
|
||||||
|
|
||||||
#ifndef PR_SPEC_NOT_AFFECTED
|
|
||||||
# define PR_SPEC_NOT_AFFECTED 0
|
|
||||||
#endif
|
|
||||||
#ifndef PR_SPEC_PRCTL
|
|
||||||
# define PR_SPEC_PRCTL (1UL << 0)
|
|
||||||
#endif
|
|
||||||
#ifndef PR_SPEC_ENABLE
|
|
||||||
# define PR_SPEC_ENABLE (1UL << 1)
|
|
||||||
#endif
|
|
||||||
#ifndef PR_SPEC_DISABLE
|
|
||||||
# define PR_SPEC_DISABLE (1UL << 2)
|
|
||||||
#endif
|
|
||||||
#ifndef PR_SPEC_FORCE_DISABLE
|
|
||||||
# define PR_SPEC_FORCE_DISABLE (1UL << 3)
|
|
||||||
#endif
|
|
||||||
#ifndef PR_SPEC_DISABLE_NOEXEC
|
|
||||||
# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void set_speculation() {
|
|
||||||
#if defined(__linux__) && defined(__x86_64__)
|
|
||||||
// PR_SPEC_DISABLE_NOEXEC doesn't survive execve, so we can't use it
|
|
||||||
// if ( prctl(PR_SET_SPECULATION_CTRL,
|
|
||||||
// PR_SPEC_STORE_BYPASS,
|
|
||||||
// PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
|
|
||||||
#else
|
|
||||||
#warning alt-java requested but SSB mitigation not available on this platform.
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
|
||||||
set_speculation();
|
|
||||||
|
|
||||||
char our_name[PATH_MAX], java_name[PATH_MAX];
|
|
||||||
ssize_t len = readlink("/proc/self/exe", our_name, PATH_MAX - 1);
|
|
||||||
if (len < 0) {
|
|
||||||
perror("I can't find myself");
|
|
||||||
exit(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
our_name[len] = '\0'; // readlink(2) doesn't append a null byte
|
|
||||||
char *path = dirname(our_name);
|
|
||||||
strncpy(java_name, path, PATH_MAX - 1);
|
|
||||||
|
|
||||||
size_t remaining_bytes = PATH_MAX - strlen(path) - 1;
|
|
||||||
strncat(java_name, "/java", remaining_bytes);
|
|
||||||
|
|
||||||
execv(java_name, argv);
|
|
||||||
fprintf(stderr, "%s failed to launch: %s\n", java_name, strerror(errno));
|
|
||||||
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
# Copyright (C) 2020 Red Hat, Inc.
|
||||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
@ -18,44 +18,37 @@
|
|||||||
|
|
||||||
TREE=${1}
|
TREE=${1}
|
||||||
|
|
||||||
if test "${TREE}" = ""; then
|
if test "x${TREE}" = "x"; then
|
||||||
TREE=${PWD}
|
TREE=${PWD}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e "${TREE}"/nashorn/.hg ] || [ -e "${TREE}"/nashorn/merge.changeset ] ; then
|
if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
|
||||||
NASHORN="nashorn" ;
|
NASHORN="nashorn" ;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e "${TREE}"/corba/.hg ] || [ -e "${TREE}"/corba/merge.changeset ] ; then
|
if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
|
||||||
CORBA="corba";
|
CORBA="corba";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e "${TREE}"/jaxp/.hg ] || [ -e "${TREE}"/jaxp/merge.changeset ] ; then
|
if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
|
||||||
JAXP="jaxp";
|
JAXP="jaxp";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e "${TREE}"/jaxws/.hg ] || [ -e "${TREE}"/jaxws/merge.changeset ] ; then
|
if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
|
||||||
JAXWS="jaxws";
|
JAXWS="jaxws";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e "${TREE}"/langtools/.hg ] || [ -e "${TREE}"/langtools/merge.changeset ] ; then
|
if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
|
||||||
LANGTOOLS="langtools";
|
LANGTOOLS="langtools";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e "${TREE}"/jdk/.hg ] || [ -e "${TREE}"/jdk/merge.changeset ] ; then
|
if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
|
||||||
JDK="jdk";
|
JDK="jdk";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e "${TREE}"/hotspot/.hg ] || [ -e "${TREE}"/hotspot/merge.changeset ] ; then
|
if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
|
||||||
HOTSPOT="hotspot";
|
HOTSPOT="hotspot";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
|
SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
|
||||||
echo "${SUBTREES}"
|
echo ${SUBTREES}
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck discover_trees.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
# recipients: java-qa
|
# recipients: java-qa
|
||||||
--- !Policy
|
--- !Policy
|
||||||
product_versions:
|
product_versions:
|
||||||
- rhel-9
|
- rhel-8
|
||||||
decision_context: osci_compose_gate
|
decision_context: osci_compose_gate
|
||||||
rules:
|
rules:
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||||
|
|||||||
210
generate_source_tarball.sh
Executable file
210
generate_source_tarball.sh
Executable file
@ -0,0 +1,210 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Generates the 'source tarball' for JDK projects.
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
# When used from local repo set REPO_ROOT pointing to file:// with your repo
|
||||||
|
# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
|
||||||
|
# If you want to use a local copy of patch PR3788, set the path to it in the PR3788 variable
|
||||||
|
#
|
||||||
|
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
||||||
|
# PROJECT_NAME=openjdk
|
||||||
|
# REPO_NAME=jdk17u
|
||||||
|
# VERSION=jdk-17.0.3+5
|
||||||
|
# or to eg prepare systemtap:
|
||||||
|
# icedtea7's jstack and other tapsets
|
||||||
|
# VERSION=6327cf1cea9e
|
||||||
|
# REPO_NAME=icedtea7-2.6
|
||||||
|
# PROJECT_NAME=release
|
||||||
|
# OPENJDK_URL=http://icedtea.classpath.org/hg/
|
||||||
|
# TO_COMPRESS="*/tapset"
|
||||||
|
#
|
||||||
|
# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
|
||||||
|
|
||||||
|
# This script creates a single source tarball out of the repository
|
||||||
|
# based on the given tag and removes code not allowed in fedora/rhel. For
|
||||||
|
# consistency, the source tarball will always contain 'openjdk' as the top
|
||||||
|
# level folder, name is created, based on parameter
|
||||||
|
#
|
||||||
|
|
||||||
|
if [ ! "x$PR3823" = "x" ] ; then
|
||||||
|
if [ ! -f "$PR3823" ] ; then
|
||||||
|
echo "You have specified PR3823 as $PR3823 but it does not exist. Exiting"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
OPENJDK_URL_DEFAULT=https://github.com
|
||||||
|
COMPRESSION_DEFAULT=xz
|
||||||
|
# Corresponding IcedTea version
|
||||||
|
ICEDTEA_VERSION=13.0
|
||||||
|
|
||||||
|
if [ "x$1" = "xhelp" ] ; then
|
||||||
|
echo -e "Behaviour may be specified by setting the following variables:\n"
|
||||||
|
echo "VERSION - the version of the specified OpenJDK project"
|
||||||
|
echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
|
||||||
|
echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
|
||||||
|
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
|
||||||
|
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
|
||||||
|
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
|
||||||
|
echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
|
||||||
|
echo "PR3823 - the path to the PR3823 patch to apply (optional; downloaded if unavailable)"
|
||||||
|
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if [ "x$VERSION" = "x" ] ; then
|
||||||
|
echo "No VERSION specified"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
echo "Version: ${VERSION}"
|
||||||
|
|
||||||
|
NUM_VER=${VERSION##jdk-}
|
||||||
|
RELEASE_VER=${NUM_VER%%+*}
|
||||||
|
BUILD_VER=${NUM_VER##*+}
|
||||||
|
MAJOR_VER=${RELEASE_VER%%.*}
|
||||||
|
echo "Major version is ${MAJOR_VER}, release ${RELEASE_VER}, build ${BUILD_VER}"
|
||||||
|
|
||||||
|
if [ "x$BOOT_JDK" = "x" ] ; then
|
||||||
|
echo "No boot JDK specified".
|
||||||
|
BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
|
||||||
|
echo -n "Checking for ${BOOT_JDK}...";
|
||||||
|
if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
|
||||||
|
echo "Boot JDK found at ${BOOT_JDK}";
|
||||||
|
else
|
||||||
|
echo "Not found";
|
||||||
|
PREV_VER=$((${MAJOR_VER} - 1));
|
||||||
|
BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
|
||||||
|
echo -n "Checking for ${BOOT_JDK}...";
|
||||||
|
if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
|
||||||
|
echo "Boot JDK found at ${BOOT_JDK}";
|
||||||
|
else
|
||||||
|
echo "Not found";
|
||||||
|
exit 4;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Boot JDK: ${BOOT_JDK}";
|
||||||
|
fi
|
||||||
|
|
||||||
|
# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
|
||||||
|
if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
|
||||||
|
if [ "x$PROJECT_NAME" = "x" ] ; then
|
||||||
|
echo "No PROJECT_NAME specified"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Project name: ${PROJECT_NAME}"
|
||||||
|
if [ "x$REPO_NAME" = "x" ] ; then
|
||||||
|
echo "No REPO_NAME specified"
|
||||||
|
exit 3
|
||||||
|
fi
|
||||||
|
echo "Repository name: ${REPO_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "x$OPENJDK_URL" = "x" ] ; then
|
||||||
|
OPENJDK_URL=${OPENJDK_URL_DEFAULT}
|
||||||
|
echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
|
||||||
|
else
|
||||||
|
echo "OpenJDK URL: ${OPENJDK_URL}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "x$COMPRESSION" = "x" ] ; then
|
||||||
|
# rhel 5 needs tar.gz
|
||||||
|
COMPRESSION=${COMPRESSION_DEFAULT}
|
||||||
|
fi
|
||||||
|
echo "Creating a tar.${COMPRESSION} archive"
|
||||||
|
|
||||||
|
if [ "x$FILE_NAME_ROOT" = "x" ] ; then
|
||||||
|
FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
|
||||||
|
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
|
||||||
|
fi
|
||||||
|
if [ "x$REPO_ROOT" = "x" ] ; then
|
||||||
|
REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
|
||||||
|
echo "No repository root specified; default to ${REPO_ROOT}"
|
||||||
|
fi;
|
||||||
|
|
||||||
|
if [ "x$TO_COMPRESS" = "x" ] ; then
|
||||||
|
TO_COMPRESS="openjdk"
|
||||||
|
echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
|
||||||
|
fi;
|
||||||
|
|
||||||
|
if [ -d ${FILE_NAME_ROOT} ] ; then
|
||||||
|
echo "exists exists exists exists exists exists exists "
|
||||||
|
echo "reusing reusing reusing reusing reusing reusing "
|
||||||
|
echo ${FILE_NAME_ROOT}
|
||||||
|
else
|
||||||
|
mkdir "${FILE_NAME_ROOT}"
|
||||||
|
pushd "${FILE_NAME_ROOT}"
|
||||||
|
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
|
||||||
|
git clone -b ${VERSION} ${REPO_ROOT} openjdk
|
||||||
|
popd
|
||||||
|
fi
|
||||||
|
pushd "${FILE_NAME_ROOT}"
|
||||||
|
if [ -d openjdk/src ]; then
|
||||||
|
pushd openjdk
|
||||||
|
echo "Removing EC source code we don't build"
|
||||||
|
CRYPTO_PATH=src/jdk.crypto.ec/share/native/libsunec/impl
|
||||||
|
rm -vf ${CRYPTO_PATH}/ec2.h
|
||||||
|
rm -vf ${CRYPTO_PATH}/ec2_163.c
|
||||||
|
rm -vf ${CRYPTO_PATH}/ec2_193.c
|
||||||
|
rm -vf ${CRYPTO_PATH}/ec2_233.c
|
||||||
|
rm -vf ${CRYPTO_PATH}/ec2_aff.c
|
||||||
|
rm -vf ${CRYPTO_PATH}/ec2_mont.c
|
||||||
|
rm -vf ${CRYPTO_PATH}/ecp_192.c
|
||||||
|
rm -vf ${CRYPTO_PATH}/ecp_224.c
|
||||||
|
|
||||||
|
echo "Syncing EC list with NSS"
|
||||||
|
if [ "x$PR3823" = "x" ] ; then
|
||||||
|
# get PR3823.patch (from https://github.com/icedtea-git/icedtea) in the ${ICEDTEA_VERSION} branch
|
||||||
|
# Do not push it or publish it
|
||||||
|
echo "PR3823 not found. Downloading..."
|
||||||
|
wget -v https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/pr3823.patch
|
||||||
|
echo "Applying ${PWD}/pr3823.patch"
|
||||||
|
patch -Np1 < pr3823.patch
|
||||||
|
rm pr3823.patch
|
||||||
|
else
|
||||||
|
echo "Applying ${PR3823}"
|
||||||
|
patch -Np1 < $PR3823
|
||||||
|
fi;
|
||||||
|
find . -name '*.orig' -exec rm -vf '{}' ';'
|
||||||
|
popd
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Generate .src-rev so build has knowledge of the revision the tarball was created from
|
||||||
|
mkdir build
|
||||||
|
pushd build
|
||||||
|
sh ${PWD}/../openjdk/configure --with-boot-jdk=${BOOT_JDK}
|
||||||
|
make store-source-revision
|
||||||
|
popd
|
||||||
|
rm -rf build
|
||||||
|
|
||||||
|
# Remove commit checks
|
||||||
|
echo "Removing $(find openjdk -name '.jcheck' -print)"
|
||||||
|
find openjdk -name '.jcheck' -print0 | xargs -0 rm -r
|
||||||
|
|
||||||
|
# Remove history and GHA
|
||||||
|
echo "find openjdk -name '.hgtags'"
|
||||||
|
find openjdk -name '.hgtags' -exec rm -v '{}' '+'
|
||||||
|
echo "find openjdk -name '.hgignore'"
|
||||||
|
find openjdk -name '.hgignore' -exec rm -v '{}' '+'
|
||||||
|
echo "find openjdk -name '.gitattributes'"
|
||||||
|
find openjdk -name '.gitattributes' -exec rm -v '{}' '+'
|
||||||
|
echo "find openjdk -name '.gitignore'"
|
||||||
|
find openjdk -name '.gitignore' -exec rm -v '{}' '+'
|
||||||
|
echo "find openjdk -name '.git'"
|
||||||
|
find openjdk -name '.git' -exec rm -rv '{}' '+'
|
||||||
|
echo "find openjdk -name '.github'"
|
||||||
|
find openjdk -name '.github' -exec rm -rv '{}' '+'
|
||||||
|
|
||||||
|
echo "Compressing remaining forest"
|
||||||
|
if [ "X$COMPRESSION" = "Xxz" ] ; then
|
||||||
|
SWITCH=cJf
|
||||||
|
else
|
||||||
|
SWITCH=czf
|
||||||
|
fi
|
||||||
|
tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
|
||||||
|
mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} ..
|
||||||
|
popd
|
||||||
|
echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
# Copyright (C) 2019 Red Hat, Inc.
|
||||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
@ -26,31 +26,31 @@ ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
RPM_DIR=${PWD}
|
RPM_DIR=${PWD}
|
||||||
if [ ! -f "${RPM_DIR}/jconsole.desktop.in" ] ; then
|
if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
|
||||||
echo "Not in RPM source tree.";
|
echo "Not in RPM source tree.";
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${TMPDIR}" = ""; then
|
if test "x${TMPDIR}" = "x"; then
|
||||||
TMPDIR=/tmp;
|
TMPDIR=/tmp;
|
||||||
fi
|
fi
|
||||||
WORKDIR=${TMPDIR}/it.sync
|
WORKDIR=${TMPDIR}/it.sync
|
||||||
|
|
||||||
echo "Using working directory ${WORKDIR}"
|
echo "Using working directory ${WORKDIR}"
|
||||||
mkdir "${WORKDIR}"
|
mkdir ${WORKDIR}
|
||||||
pushd "${WORKDIR}"
|
pushd ${WORKDIR}
|
||||||
|
|
||||||
if test "${WGET}" = ""; then
|
if test "x${WGET}" = "x"; then
|
||||||
WGET=$(which wget);
|
WGET=$(which wget);
|
||||||
if test "${WGET}" = ""; then
|
if test "x${WGET}" = "x"; then
|
||||||
echo "wget not found";
|
echo "wget not found";
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${TAR}" = ""; then
|
if test "x${TAR}" = "x"; then
|
||||||
TAR=$(which tar)
|
TAR=$(which tar)
|
||||||
if test "${TAR}" = ""; then
|
if test "x${TAR}" = "x"; then
|
||||||
echo "tar not found";
|
echo "tar not found";
|
||||||
exit 2;
|
exit 2;
|
||||||
fi
|
fi
|
||||||
@ -60,36 +60,36 @@ echo "Dependencies:";
|
|||||||
echo -e "\tWGET: ${WGET}";
|
echo -e "\tWGET: ${WGET}";
|
||||||
echo -e "\tTAR: ${TAR}\n";
|
echo -e "\tTAR: ${TAR}\n";
|
||||||
|
|
||||||
if test "${ICEDTEA_USE_VCS}" = "true"; then
|
if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
|
||||||
echo "Mode: Using VCS";
|
echo "Mode: Using VCS";
|
||||||
|
|
||||||
if test "${GREP}" = ""; then
|
if test "x${GREP}" = "x"; then
|
||||||
GREP=$(which grep);
|
GREP=$(which grep);
|
||||||
if test "${GREP}" = ""; then
|
if test "x${GREP}" = "x"; then
|
||||||
echo "grep not found";
|
echo "grep not found";
|
||||||
exit 3;
|
exit 3;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${CUT}" = ""; then
|
if test "x${CUT}" = "x"; then
|
||||||
CUT=$(which cut);
|
CUT=$(which cut);
|
||||||
if test "${CUT}" = ""; then
|
if test "x${CUT}" = "x"; then
|
||||||
echo "cut not found";
|
echo "cut not found";
|
||||||
exit 4;
|
exit 4;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${TR}" = ""; then
|
if test "x${TR}" = "x"; then
|
||||||
TR=$(which tr);
|
TR=$(which tr);
|
||||||
if test "${TR}" = ""; then
|
if test "x${TR}" = "x"; then
|
||||||
echo "tr not found";
|
echo "tr not found";
|
||||||
exit 5;
|
exit 5;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${HG}" = ""; then
|
if test "x${HG}" = "x"; then
|
||||||
HG=$(which hg);
|
HG=$(which hg);
|
||||||
if test "${HG}" = ""; then
|
if test "x${HG}" = "x"; then
|
||||||
echo "hg not found";
|
echo "hg not found";
|
||||||
exit 6;
|
exit 6;
|
||||||
fi
|
fi
|
||||||
@ -113,33 +113,33 @@ if test "${ICEDTEA_USE_VCS}" = "true"; then
|
|||||||
|
|
||||||
ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
|
ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
|
||||||
echo "Creating icedtea-${ICEDTEA_VERSION}";
|
echo "Creating icedtea-${ICEDTEA_VERSION}";
|
||||||
mkdir "icedtea-${ICEDTEA_VERSION}"
|
mkdir icedtea-${ICEDTEA_VERSION}
|
||||||
echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
|
echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
|
||||||
# Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
|
# Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
|
||||||
#cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
|
#cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
|
||||||
cp -a "${RPM_DIR}/jconsole.desktop.in" "icedtea-${ICEDTEA_VERSION}"
|
cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
|
||||||
cp -a icedtea/tapset "icedtea-${ICEDTEA_VERSION}"
|
cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
|
||||||
|
|
||||||
rm -rf icedtea
|
rm -rf icedtea
|
||||||
else
|
else
|
||||||
echo "Mode: Using tarball";
|
echo "Mode: Using tarball";
|
||||||
|
|
||||||
if test "${ICEDTEA_VERSION}" = ""; then
|
if test "x${ICEDTEA_VERSION}" = "x"; then
|
||||||
echo "No IcedTea version specified for tarball download.";
|
echo "No IcedTea version specified for tarball download.";
|
||||||
exit 3;
|
exit 3;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${CHECKSUM}" = ""; then
|
if test "x${CHECKSUM}" = "x"; then
|
||||||
CHECKSUM=$(which sha256sum)
|
CHECKSUM=$(which sha256sum)
|
||||||
if test "${CHECKSUM}" = ""; then
|
if test "x${CHECKSUM}" = "x"; then
|
||||||
echo "sha256sum not found";
|
echo "sha256sum not found";
|
||||||
exit 4;
|
exit 4;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${PGP}" = ""; then
|
if test "x${PGP}" = "x"; then
|
||||||
PGP=$(which gpg)
|
PGP=$(which gpg)
|
||||||
if test "${PGP}" = ""; then
|
if test "x${PGP}" = "x"; then
|
||||||
echo "gpg not found";
|
echo "gpg not found";
|
||||||
exit 5;
|
exit 5;
|
||||||
fi
|
fi
|
||||||
@ -179,20 +179,13 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Replacing desktop files...";
|
echo "Replacing desktop files...";
|
||||||
mv -v "icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in" "${RPM_DIR}"
|
mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
|
||||||
|
|
||||||
echo "Creating new tapset tarball...";
|
echo "Creating new tapset tarball...";
|
||||||
mv -v "icedtea-${ICEDTEA_VERSION}" openjdk
|
mv -v icedtea-${ICEDTEA_VERSION} openjdk
|
||||||
${TAR} cJf "${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz" openjdk
|
${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
|
||||||
|
|
||||||
rm -rvf openjdk
|
rm -rvf openjdk
|
||||||
|
|
||||||
popd
|
popd
|
||||||
rm -rf "${WORKDIR}"
|
rm -rf ${WORKDIR}
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck icedtea_sync.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
97
jdk8295447-npe_in_constructor.patch
Normal file
97
jdk8295447-npe_in_constructor.patch
Normal file
@ -0,0 +1,97 @@
|
|||||||
|
commit c9d485792b99233f381dcdfd69838e7b973909bd
|
||||||
|
Author: Victor Rudometov <vrudomet@openjdk.org>
|
||||||
|
Date: Thu Dec 1 10:57:43 2022 +0000
|
||||||
|
|
||||||
|
8295447: NullPointerException with invalid pattern matching construct in constructor call
|
||||||
|
|
||||||
|
Backport-of: 6c05771b9be3dd5cbcdb40d2e53cc53959926cdd
|
||||||
|
|
||||||
|
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
|
||||||
|
index 21cc8e57e1f..46b076d3d03 100644
|
||||||
|
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
|
||||||
|
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
|
||||||
|
@@ -4145,6 +4145,10 @@ public class Attr extends JCTree.Visitor {
|
||||||
|
Type exprType,
|
||||||
|
Type pattType) {
|
||||||
|
Warner warner = new Warner();
|
||||||
|
+ // if any type is erroneous, the problem is reported elsewhere
|
||||||
|
+ if (exprType.isErroneous() || pattType.isErroneous()) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
if (!types.isCastable(exprType, pattType, warner)) {
|
||||||
|
chk.basicHandler.report(pos,
|
||||||
|
diags.fragment(Fragments.InconvertibleTypes(exprType, pattType)));
|
||||||
|
@@ -4206,7 +4210,7 @@ public class Attr extends JCTree.Visitor {
|
||||||
|
tree.record = record;
|
||||||
|
} else {
|
||||||
|
log.error(tree.pos(), Errors.DeconstructionPatternOnlyRecords(site.tsym));
|
||||||
|
- expectedRecordTypes = Stream.generate(() -> Type.noType)
|
||||||
|
+ expectedRecordTypes = Stream.generate(() -> types.createErrorType(tree.type))
|
||||||
|
.limit(tree.nested.size())
|
||||||
|
.collect(List.collector());
|
||||||
|
}
|
||||||
|
diff --git a/test/langtools/tools/javac/T8295447.java b/test/langtools/tools/javac/T8295447.java
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..76fcaf10f8d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/langtools/tools/javac/T8295447.java
|
||||||
|
@@ -0,0 +1,46 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
+ * 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 8295447
|
||||||
|
+ * @summary NullPointerException with invalid pattern matching construct in constructor call
|
||||||
|
+ * @modules jdk.compiler
|
||||||
|
+ * @compile/fail/ref=T8295447.out -XDrawDiagnostics --enable-preview -source ${jdk.version} T8295447.java
|
||||||
|
+ */
|
||||||
|
+public class T8295447 {
|
||||||
|
+ class Foo {
|
||||||
|
+ void m(Object o) {
|
||||||
|
+ if(o instanceof Foo(int x)) {}
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Foo(Object o) {
|
||||||
|
+ m((o instanceof Foo(int x))? 0 : 1);
|
||||||
|
+ }
|
||||||
|
+ void m(int i) { }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ class Base { int i; Base(int j) { i = j; } }
|
||||||
|
+ class Sub extends Base {
|
||||||
|
+ Sub(Object o) { super(o instanceof java.awt.Point(int x, int y)? x + y: 0); }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/test/langtools/tools/javac/T8295447.out b/test/langtools/tools/javac/T8295447.out
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..7f6746f802f
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/langtools/tools/javac/T8295447.out
|
||||||
|
@@ -0,0 +1,6 @@
|
||||||
|
+T8295447.java:33:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo
|
||||||
|
+T8295447.java:37:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo
|
||||||
|
+T8295447.java:44:44: compiler.err.deconstruction.pattern.only.records: java.awt.Point
|
||||||
|
+- compiler.note.preview.filename: T8295447.java, DEFAULT
|
||||||
|
+- compiler.note.preview.recompile
|
||||||
|
+3 errors
|
||||||
|
\ No newline at end of file
|
||||||
79
jdk8296239-iso4217_up174.patch
Normal file
79
jdk8296239-iso4217_up174.patch
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
commit bf899de7aa8cc862ed123865b9aa26e06d96a7de
|
||||||
|
Author: duke <duke@openjdk.org>
|
||||||
|
Date: Thu Jan 26 00:55:32 2023 +0000
|
||||||
|
|
||||||
|
Backport fd837649811c866c144c9133d211fb5ad8f994a7
|
||||||
|
|
||||||
|
diff --git a/src/java.base/share/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties
|
||||||
|
index 688de592c7b..d234c96c476 100644
|
||||||
|
--- a/src/java.base/share/data/currency/CurrencyData.properties
|
||||||
|
+++ b/src/java.base/share/data/currency/CurrencyData.properties
|
||||||
|
@@ -32,7 +32,7 @@ formatVersion=3
|
||||||
|
# Version of the currency code information in this class.
|
||||||
|
# It is a serial number that accompanies with each amendment.
|
||||||
|
|
||||||
|
-dataVersion=173
|
||||||
|
+dataVersion=174
|
||||||
|
|
||||||
|
# List of all valid ISO 4217 currency codes.
|
||||||
|
# To ensure compatibility, do not remove codes.
|
||||||
|
@@ -189,7 +189,7 @@ CR=CRC
|
||||||
|
# COTE D'IVOIRE
|
||||||
|
CI=XOF
|
||||||
|
# CROATIA
|
||||||
|
-HR=HRK
|
||||||
|
+HR=HRK;2022-12-31-23-00-00;EUR
|
||||||
|
# CUBA
|
||||||
|
CU=CUP
|
||||||
|
# Cura\u00e7ao
|
||||||
|
diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
|
||||||
|
index b7e64f318b1..b6a91835b19 100644
|
||||||
|
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
|
||||||
|
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
|
||||||
|
@@ -24,7 +24,7 @@
|
||||||
|
* @test
|
||||||
|
* @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
|
||||||
|
* 8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
|
||||||
|
- * 8208746 8209775 8264792 8274658 8283277
|
||||||
|
+ * 8208746 8209775 8264792 8274658 8283277 8296239
|
||||||
|
* @summary Validate ISO 4217 data for Currency class.
|
||||||
|
* @modules java.base/java.util:open
|
||||||
|
* jdk.localedata
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
* ############################################################################
|
||||||
|
*
|
||||||
|
* ValidateISO4217 is a tool to detect differences between the latest ISO 4217
|
||||||
|
- * data and and Java's currency data which is based on ISO 4217.
|
||||||
|
+ * data and Java's currency data which is based on ISO 4217.
|
||||||
|
* If there is a difference, the following file which includes currency data
|
||||||
|
* may need to be updated.
|
||||||
|
* src/share/classes/java/util/CurrencyData.properties
|
||||||
|
diff --git a/test/jdk/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt
|
||||||
|
index 3e107823042..3eef0eba00e 100644
|
||||||
|
--- a/test/jdk/java/util/Currency/tablea1.txt
|
||||||
|
+++ b/test/jdk/java/util/Currency/tablea1.txt
|
||||||
|
@@ -1,12 +1,12 @@
|
||||||
|
#
|
||||||
|
#
|
||||||
|
-# Amendments up until ISO 4217 AMENDMENT NUMBER 173
|
||||||
|
-# (As of 23 September 2022)
|
||||||
|
+# Amendments up until ISO 4217 AMENDMENT NUMBER 174
|
||||||
|
+# (As of 2 November 2022)
|
||||||
|
#
|
||||||
|
|
||||||
|
# Version
|
||||||
|
FILEVERSION=3
|
||||||
|
-DATAVERSION=173
|
||||||
|
+DATAVERSION=174
|
||||||
|
|
||||||
|
# ISO 4217 currency data
|
||||||
|
AF AFN 971 2
|
||||||
|
@@ -67,7 +67,7 @@ CD CDF 976 2
|
||||||
|
CK NZD 554 2
|
||||||
|
CR CRC 188 2
|
||||||
|
CI XOF 952 0
|
||||||
|
-HR HRK 191 2
|
||||||
|
+HR HRK 191 2 2022-12-31-23-00-00 EUR 978 2
|
||||||
|
CU CUP 192 2
|
||||||
|
CW ANG 532 2
|
||||||
|
CY EUR 978 2
|
||||||
63
jdk8299439-test_for_hr.patch
Normal file
63
jdk8299439-test_for_hr.patch
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
commit cf262d7441d797942d33ed2a79540230fc5c97fa
|
||||||
|
Author: Christoph Langer <clanger@openjdk.org>
|
||||||
|
Date: Thu Jan 12 08:02:58 2023 +0000
|
||||||
|
|
||||||
|
8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
|
||||||
|
|
||||||
|
Reviewed-by: naoto
|
||||||
|
Backport-of: 3b374c0153950ab193f3a188b57d3404b4ce2fe2
|
||||||
|
|
||||||
|
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
|
||||||
|
index 70f210e2da6..56e61953a8c 100644
|
||||||
|
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
|
||||||
|
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
#
|
||||||
|
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
#
|
||||||
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
|
@@ -35,4 +35,5 @@
|
||||||
|
# This notice and attribution to Taligent may not be removed.
|
||||||
|
# Taligent is a registered trademark of Taligent, Inc.
|
||||||
|
|
||||||
|
+EUR=\u20AC
|
||||||
|
HRK=Kn
|
||||||
|
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
|
||||||
|
index dc167492272..a806ebe778a 100644
|
||||||
|
--- a/test/jdk/ProblemList.txt
|
||||||
|
+++ b/test/jdk/ProblemList.txt
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
###########################################################################
|
||||||
|
#
|
||||||
|
-# Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
#
|
||||||
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
|
diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
|
||||||
|
index cf73a9c7e31..665dd3b290a 100644
|
||||||
|
--- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
|
||||||
|
+++ b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
|
||||||
|
@@ -79,7 +79,7 @@ fr_FR=\u20AC
|
||||||
|
fr_LU=\u20AC
|
||||||
|
hi_IN=\u0930\u0942
|
||||||
|
hr=\u00A4
|
||||||
|
-hr_HR=Kn
|
||||||
|
+hr_HR=\u20AC
|
||||||
|
hu=\u00A4
|
||||||
|
hu_HU=Ft
|
||||||
|
is=\u00A4
|
||||||
|
@@ -94,9 +94,9 @@ ja_JP=\uFFE5
|
||||||
|
ko=\u00A4
|
||||||
|
ko_KR=\uFFE6
|
||||||
|
lt=\u00A4
|
||||||
|
-lt_LT=Lt;2014-12-31-22-00-00;\u20AC
|
||||||
|
+lt_LT=\u20AC
|
||||||
|
lv=\u00A4
|
||||||
|
-lv_LV=Ls;2013-12-31-22-00-00;\u20AC
|
||||||
|
+lv_LV=\u20AC
|
||||||
|
mk=\u00A4
|
||||||
|
mk_MK=Den
|
||||||
|
nl=\u00A4
|
||||||
5
nss.cfg.in
Normal file
5
nss.cfg.in
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
name = NSS
|
||||||
|
nssLibraryDirectory = @NSS_LIBDIR@
|
||||||
|
nssDbMode = noDb
|
||||||
|
attributes = compatibility
|
||||||
|
handleStartupErrors = ignoreMultipleInitialisation
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
# Copyright (C) 2022 Red Hat, Inc.
|
||||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>, 2012-2022
|
# Written by Andrew John Hughes <gnu.andrew@redhat.com>, 2012-2022
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
@ -18,66 +18,59 @@
|
|||||||
|
|
||||||
OLD_RELEASE=$1
|
OLD_RELEASE=$1
|
||||||
NEW_RELEASE=$2
|
NEW_RELEASE=$2
|
||||||
REPO=$3
|
SUBDIR=$3
|
||||||
SUBDIR=$4
|
REPO=$4
|
||||||
SCRIPT_DIR=$(dirname "${0}")
|
SCRIPT_DIR=$(dirname ${0})
|
||||||
|
|
||||||
if test "${SUBDIR}" = ""; then
|
if test "x${SUBDIR}" = "x"; then
|
||||||
echo "No subdirectory specified; using .";
|
echo "No subdirectory specified; using .";
|
||||||
SUBDIR=".";
|
SUBDIR=".";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$REPO" = ""; then
|
if test "x$REPO" = "x"; then
|
||||||
echo "No repository specified; using ${PWD}"
|
echo "No repository specified; using ${PWD}"
|
||||||
REPO=${PWD}
|
REPO=${PWD}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${TMPDIR}" = ""; then
|
if test x${TMPDIR} = x; then
|
||||||
TMPDIR=/tmp;
|
TMPDIR=/tmp;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Repository: ${REPO}"
|
echo "Repository: ${REPO}"
|
||||||
|
|
||||||
if [ -e "${REPO}/.git" ] ; then
|
if [ -e ${REPO}/.git ] ; then
|
||||||
TYPE=git;
|
TYPE=git;
|
||||||
elif [ -e "${REPO}/.hg" ] ; then
|
elif [ -e ${REPO}/.hg ] ; then
|
||||||
TYPE=hg;
|
TYPE=hg;
|
||||||
else
|
else
|
||||||
echo "No Mercurial or Git repository detected.";
|
echo "No Mercurial or Git repository detected.";
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$OLD_RELEASE" = "" || test "$NEW_RELEASE" = ""; then
|
if test "x$OLD_RELEASE" = "x" || test "x$NEW_RELEASE" = "x"; then
|
||||||
echo "ERROR: Need to specify old and new release";
|
echo "ERROR: Need to specify old and new release";
|
||||||
exit 2;
|
exit 2;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
|
echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
|
||||||
rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" "${TMPDIR}/fixes"
|
rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 ${TMPDIR}/fixes
|
||||||
for repos in . $("${SCRIPT_DIR}/discover_trees.sh" "${REPO}");
|
for repos in . $(${SCRIPT_DIR}/discover_trees.sh ${REPO});
|
||||||
do
|
do
|
||||||
if test "$TYPE" = "hg"; then
|
if test "x$TYPE" = "xhg"; then
|
||||||
hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R "$REPO/$repos" -G -M "${REPO}/${SUBDIR}" | \
|
hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
|
||||||
grep -E '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])# - JDK-\1#'| \
|
egrep '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])# - JDK-\1#'| \
|
||||||
sed 's#^[o:| ]*summary:\W*# - #' >> "${TMPDIR}/fixes2";
|
sed 's#^[o:| ]*summary:\W*# - #' >> ${TMPDIR}/fixes2;
|
||||||
hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R "$REPO/$repos" -G -M "${REPO}/${SUBDIR}" | \
|
hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
|
||||||
grep -E '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})# - JDK-\1#' >> "${TMPDIR}/fixes3";
|
egrep '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})# - JDK-\1#' >> ${TMPDIR}/fixes3;
|
||||||
else
|
else
|
||||||
git -C "${REPO}" log --no-merges --pretty=format:%B "${NEW_RELEASE}...${OLD_RELEASE}" -- "${SUBDIR}" |grep -E '^[0-9]{7}' | \
|
git -C ${REPO} log --no-merges --pretty=format:%B ${NEW_RELEASE}...${OLD_RELEASE} -- ${SUBDIR} |egrep '^[0-9]{7}' | \
|
||||||
sed -r 's#^([0-9])# - JDK-\1#' >> "${TMPDIR}/fixes2";
|
sed -r 's#^([0-9])# - JDK-\1#' >> ${TMPDIR}/fixes2;
|
||||||
touch "${TMPDIR}/fixes3" ; # unused
|
touch ${TMPDIR}/fixes3 ; # unused
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
sort "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" | uniq > "${TMPDIR}/fixes"
|
sort ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 | uniq > ${TMPDIR}/fixes
|
||||||
rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3"
|
rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3
|
||||||
|
|
||||||
echo "In ${TMPDIR}/fixes:"
|
echo "In ${TMPDIR}/fixes:"
|
||||||
cat "${TMPDIR}/fixes"
|
cat ${TMPDIR}/fixes
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck openjdk_news.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
16
rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
Normal file
16
rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff -r 618ad1237e73 src/java.desktop/share/classes/java/awt/Toolkit.java
|
||||||
|
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jun 13 19:37:49 2019 +0200
|
||||||
|
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jul 04 10:35:42 2019 +0200
|
||||||
|
@@ -595,7 +595,11 @@
|
||||||
|
toolkit = new HeadlessToolkit(toolkit);
|
||||||
|
}
|
||||||
|
if (!GraphicsEnvironment.isHeadless()) {
|
||||||
|
- loadAssistiveTechnologies();
|
||||||
|
+ try {
|
||||||
|
+ loadAssistiveTechnologies();
|
||||||
|
+ } catch (AWTError error) {
|
||||||
|
+ // ignore silently
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return toolkit;
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff --git openjdk.orig/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
|
||||||
|
index 68a9c1a2d08..7aa25eb2cb7 100644
|
||||||
|
--- openjdk.orig/src/java.base/share/conf/security/java.security
|
||||||
|
+++ openjdk/src/java.base/share/conf/security/java.security
|
||||||
|
@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
|
||||||
|
security.provider.tbd=Apple
|
||||||
|
#endif
|
||||||
|
security.provider.tbd=SunPKCS11
|
||||||
|
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
||||||
|
|
||||||
|
#
|
||||||
|
# Security providers used when FIPS mode support is active
|
||||||
20
rh1648644-java_access_bridge_privileged_security.patch
Normal file
20
rh1648644-java_access_bridge_privileged_security.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- openjdk/src/java.base/share/conf/security/java.security
|
||||||
|
+++ openjdk/src/java.base/share/conf/security/java.security
|
||||||
|
@@ -304,6 +304,8 @@
|
||||||
|
#
|
||||||
|
package.access=sun.misc.,\
|
||||||
|
sun.reflect.,\
|
||||||
|
+ org.GNOME.Accessibility.,\
|
||||||
|
+ org.GNOME.Bonobo.,\
|
||||||
|
|
||||||
|
#
|
||||||
|
# List of comma-separated packages that start with or equal this string
|
||||||
|
@@ -316,6 +318,8 @@
|
||||||
|
#
|
||||||
|
package.definition=sun.misc.,\
|
||||||
|
sun.reflect.,\
|
||||||
|
+ org.GNOME.Accessibility.,\
|
||||||
|
+ org.GNOME.Bonobo.,\
|
||||||
|
|
||||||
|
#
|
||||||
|
# Determines whether this properties file can be appended to
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||||
|
index bacff32efbc..ff7b3dcc81c 100644
|
||||||
|
--- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||||
|
+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||||
|
@@ -46,8 +46,8 @@ class PlatformPCSC {
|
||||||
|
|
||||||
|
private static final String PROP_NAME = "sun.security.smartcardio.library";
|
||||||
|
|
||||||
|
- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
|
||||||
|
- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
|
||||||
|
+ private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
|
||||||
|
+ private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
|
||||||
|
private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
|
||||||
|
|
||||||
|
PlatformPCSC() {
|
||||||
117
rh1750419-redhat_alt_java.patch
Normal file
117
rh1750419-redhat_alt_java.patch
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
diff --git openjdk.orig/make/modules/java.base/Launcher.gmk openjdk/make/modules/java.base/Launcher.gmk
|
||||||
|
index 700ddefda49..2882de68eb2 100644
|
||||||
|
--- openjdk.orig/make/modules/java.base/Launcher.gmk
|
||||||
|
+++ openjdk/make/modules/java.base/Launcher.gmk
|
||||||
|
@@ -41,6 +41,14 @@ $(eval $(call SetupBuildLauncher, java, \
|
||||||
|
OPTIMIZATION := HIGH, \
|
||||||
|
))
|
||||||
|
|
||||||
|
+#Wno-error=cpp is present to allow commented warning in ifdef part of main.c
|
||||||
|
+$(eval $(call SetupBuildLauncher, alt-java, \
|
||||||
|
+ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES -DREDHAT_ALT_JAVA -Wno-error=cpp, \
|
||||||
|
+ EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
|
||||||
|
+ VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
|
||||||
|
+ OPTIMIZATION := HIGH, \
|
||||||
|
+))
|
||||||
|
+
|
||||||
|
ifeq ($(call isTargetOs, windows), true)
|
||||||
|
$(eval $(call SetupBuildLauncher, javaw, \
|
||||||
|
CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
|
||||||
|
diff --git openjdk.orig/src/java.base/share/native/launcher/alt_main.h openjdk/src/java.base/share/native/launcher/alt_main.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..697df2898ac
|
||||||
|
--- /dev/null
|
||||||
|
+++ openjdk/src/java.base/share/native/launcher/alt_main.h
|
||||||
|
@@ -0,0 +1,73 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
|
||||||
|
+ * 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. Oracle designates this
|
||||||
|
+ * particular file as subject to the "Classpath" exception as provided
|
||||||
|
+ * by Oracle in the LICENSE file that accompanied this code.
|
||||||
|
+ *
|
||||||
|
+ * 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.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#ifdef REDHAT_ALT_JAVA
|
||||||
|
+
|
||||||
|
+#include <sys/prctl.h>
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+/* Per task speculation control */
|
||||||
|
+#ifndef PR_GET_SPECULATION_CTRL
|
||||||
|
+# define PR_GET_SPECULATION_CTRL 52
|
||||||
|
+#endif
|
||||||
|
+#ifndef PR_SET_SPECULATION_CTRL
|
||||||
|
+# define PR_SET_SPECULATION_CTRL 53
|
||||||
|
+#endif
|
||||||
|
+/* Speculation control variants */
|
||||||
|
+#ifndef PR_SPEC_STORE_BYPASS
|
||||||
|
+# define PR_SPEC_STORE_BYPASS 0
|
||||||
|
+#endif
|
||||||
|
+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
|
||||||
|
+
|
||||||
|
+#ifndef PR_SPEC_NOT_AFFECTED
|
||||||
|
+# define PR_SPEC_NOT_AFFECTED 0
|
||||||
|
+#endif
|
||||||
|
+#ifndef PR_SPEC_PRCTL
|
||||||
|
+# define PR_SPEC_PRCTL (1UL << 0)
|
||||||
|
+#endif
|
||||||
|
+#ifndef PR_SPEC_ENABLE
|
||||||
|
+# define PR_SPEC_ENABLE (1UL << 1)
|
||||||
|
+#endif
|
||||||
|
+#ifndef PR_SPEC_DISABLE
|
||||||
|
+# define PR_SPEC_DISABLE (1UL << 2)
|
||||||
|
+#endif
|
||||||
|
+#ifndef PR_SPEC_FORCE_DISABLE
|
||||||
|
+# define PR_SPEC_FORCE_DISABLE (1UL << 3)
|
||||||
|
+#endif
|
||||||
|
+#ifndef PR_SPEC_DISABLE_NOEXEC
|
||||||
|
+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+static void set_speculation() __attribute__((constructor));
|
||||||
|
+static void set_speculation() {
|
||||||
|
+ if ( prctl(PR_SET_SPECULATION_CTRL,
|
||||||
|
+ PR_SPEC_STORE_BYPASS,
|
||||||
|
+ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#endif // REDHAT_ALT_JAVA
|
||||||
|
diff --git openjdk.orig/src/java.base/share/native/launcher/main.c openjdk/src/java.base/share/native/launcher/main.c
|
||||||
|
index b734fe2ba78..79dc8307650 100644
|
||||||
|
--- openjdk.orig/src/java.base/share/native/launcher/main.c
|
||||||
|
+++ openjdk/src/java.base/share/native/launcher/main.c
|
||||||
|
@@ -34,6 +34,14 @@
|
||||||
|
#include "jli_util.h"
|
||||||
|
#include "jni.h"
|
||||||
|
|
||||||
|
+#ifdef REDHAT_ALT_JAVA
|
||||||
|
+#if defined(__linux__) && defined(__x86_64__)
|
||||||
|
+#include "alt_main.h"
|
||||||
|
+#else
|
||||||
|
+#warning alt-java requested but SSB mitigation not available on this platform.
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#if _MSC_VER > 1400 && _MSC_VER < 1600
|
||||||
|
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
Remove uses of FAR in jpeg code
|
||||||
|
|
||||||
|
Upstream libjpeg-trubo removed the (empty) FAR macro:
|
||||||
|
http://sourceforge.net/p/libjpeg-turbo/code/1312/
|
||||||
|
|
||||||
|
Adjust our code to not use the undefined FAR macro anymore.
|
||||||
|
|
||||||
|
diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
|
||||||
|
--- openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
|
||||||
|
+++ openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
|
||||||
|
@@ -1385,7 +1385,7 @@
|
||||||
|
/* and fill it in */
|
||||||
|
dst_ptr = icc_data;
|
||||||
|
for (seq_no = first; seq_no < last; seq_no++) {
|
||||||
|
- JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
|
||||||
|
+ JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
|
||||||
|
unsigned int length =
|
||||||
|
icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
|
||||||
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Builds the RPM on CentOS 9 or 10
|
|
||||||
|
|
||||||
centpkg -v build
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck build_centos.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Builds the portable on CentOS
|
|
||||||
|
|
||||||
centpkg -v build --target java-openjdk-portable-build --rhel-target none
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck build_centos_portable_build.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Builds the RPM on RHEL 10
|
|
||||||
|
|
||||||
NVR=${1}
|
|
||||||
USER=${2}
|
|
||||||
|
|
||||||
if test "${NVR}" = ""; then
|
|
||||||
echo "${0} <NVR> <USER>";
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "${USER}" = ""; then
|
|
||||||
echo "${0} <NVR> <USER>";
|
|
||||||
exit 2;
|
|
||||||
fi
|
|
||||||
|
|
||||||
METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
|
|
||||||
rhpkg -v build --target=java-openjdk-rhel-10-build --custom-user-metadata "${METADATA}"
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck build_rhel_10.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Builds the portable on RHEL 7
|
|
||||||
|
|
||||||
rhpkg -v build --target=java-openjdk-rhel-7-build --skip-nvr-check
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck build_rhel_7_portable_build.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Builds the RPM on RHEL 8
|
|
||||||
|
|
||||||
NVR=${1}
|
|
||||||
USER=${2}
|
|
||||||
|
|
||||||
if test "${NVR}" = ""; then
|
|
||||||
echo "${0} <NVR> <USER>";
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "${USER}" = ""; then
|
|
||||||
echo "${0} <NVR> <USER>";
|
|
||||||
exit 2;
|
|
||||||
fi
|
|
||||||
|
|
||||||
METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
|
|
||||||
rhpkg -v build --target=java-openjdk-rhel-8-build --custom-user-metadata "${METADATA}"
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck build_rhel_8.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Builds the RPM on RHEL 9
|
|
||||||
|
|
||||||
NVR=${1}
|
|
||||||
USER=${2}
|
|
||||||
|
|
||||||
if test "${NVR}" = ""; then
|
|
||||||
echo "${0} <NVR> <USER>";
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "${USER}" = ""; then
|
|
||||||
echo "${0} <NVR> <USER>";
|
|
||||||
exit 2;
|
|
||||||
fi
|
|
||||||
|
|
||||||
METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
|
|
||||||
rhpkg -v build --target=java-openjdk-rhel-9-build --custom-user-metadata "${METADATA}"
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck build_rhel_9.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Builds the portable on RHEL 8
|
|
||||||
|
|
||||||
rhpkg -v build --target=java-openjdk-rhel-8-build --skip-nvr-check
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck build_rhel_portable_build.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Builds a scratch build of vanilla OpenJDK with no local patches
|
|
||||||
|
|
||||||
SEPARATE_ARCHES=${1}
|
|
||||||
CMD="--target java-openjdk-rhel-8-build --skip-nvr-check --nowait";
|
|
||||||
SUPPORTED_ARCHES="aarch64 ppc64le s390x x86_64";
|
|
||||||
|
|
||||||
if [ "x${SEPARATE_ARCHES}" = "x" ] ; then
|
|
||||||
SEPARATE_ARCHES=0;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ${SEPARATE_ARCHES} -eq 1 ] ; then
|
|
||||||
for arch in ${SUPPORTED_ARCHES}; do \
|
|
||||||
rhpkg -v build --arches ${arch} --scratch ${CMD} ; \
|
|
||||||
done && brew watch-task --mine
|
|
||||||
else
|
|
||||||
rhpkg -v build ${CMD} && brew watch-task --mine
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck build_vanilla.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
@ -1,294 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Copyright (C) 2024 Red Hat, Inc.
|
|
||||||
# Written by:
|
|
||||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
|
||||||
# Thomas Fitzsimmons <fitzsim@redhat.com>
|
|
||||||
# Jiri Vanek <jvanek@redhat.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program 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 Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# Generates the source tarball for OpenJDK projects.
|
|
||||||
#
|
|
||||||
# There are multiple ways to specify the source code location and version:
|
|
||||||
#
|
|
||||||
# 1. Specify the version (VERSION), the location of the Git repository
|
|
||||||
# (REPO_ROOT) and the root of the output tarball name (FILE_NAME_ROOT)
|
|
||||||
# 2. Specify the version (VERSION) along with an upstream project name
|
|
||||||
# (PROJECT_NAME) and repository name (REPO_NAME) that can be used
|
|
||||||
# to construct the URL of the upstream OpenJDK repository.
|
|
||||||
# 3. Specify OPENJDK_LATEST=1 and allow the script to obtain the JDK
|
|
||||||
# feature version from the spec file, which is then used to
|
|
||||||
# obtain the latest build promotion from the upstream repository.
|
|
||||||
#
|
|
||||||
# An appropriate bootstrap JDK is also required for when ./configure
|
|
||||||
# is run within the checked out repository to generate the .src-rev.
|
|
||||||
# file. This can be specified by setting BOOT_JDK.
|
|
||||||
#
|
|
||||||
# Example 1:
|
|
||||||
# This will check out the specified version from the specified
|
|
||||||
# repository and construct a tarball called openjdk-17.0.3+5.tar.xz:
|
|
||||||
#
|
|
||||||
# $ VERSION=jdk-17.0.3+5 FILE_NAME_ROOT=open${VERSION} \
|
|
||||||
# REPO_ROOT=$HOME/projects/openjdk/upstream/17u \
|
|
||||||
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
|
||||||
#
|
|
||||||
# Example 2:
|
|
||||||
# This will check out the same version as example 1, but from the
|
|
||||||
# upstream repository:
|
|
||||||
#
|
|
||||||
# $ VERSION=jdk-17.0.3+5 PROJECT_NAME=openjdk REPO_NAME=jdk17u \
|
|
||||||
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
|
||||||
#
|
|
||||||
# Example 3:
|
|
||||||
# This will read the OpenJDK feature version from the spec file, then create a
|
|
||||||
# tarball from the most recent tag for that version in the upstream Git
|
|
||||||
# repository.
|
|
||||||
#
|
|
||||||
# $ OPENJDK_LATEST=1 \
|
|
||||||
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
|
||||||
#
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
OPENJDK_URL_DEFAULT=https://github.com
|
|
||||||
COMPRESSION_DEFAULT=xz
|
|
||||||
|
|
||||||
if [ "$1" = "help" ] ; then
|
|
||||||
echo "Behaviour may be specified by setting the following variables:"
|
|
||||||
echo
|
|
||||||
echo "VERSION - the version of the specified OpenJDK project"
|
|
||||||
echo " (required unless OPENJDK_LATEST is set)"
|
|
||||||
echo "PROJECT_NAME - the name of the OpenJDK project being archived"
|
|
||||||
echo " (needed to compute REPO_ROOT and/or"
|
|
||||||
echo " FILE_NAME_ROOT automatically;"
|
|
||||||
echo " optional if they are set explicitly)"
|
|
||||||
echo "REPO_NAME - the name of the OpenJDK repository"
|
|
||||||
echo " (needed to compute REPO_ROOT automatically;"
|
|
||||||
echo " optional if REPO_ROOT is set explicitly)"
|
|
||||||
echo "OPENJDK_URL - the URL to retrieve code from"
|
|
||||||
echo " (defaults to ${OPENJDK_URL_DEFAULT})"
|
|
||||||
echo "COMPRESSION - the compression type to use"
|
|
||||||
echo " (defaults to ${COMPRESSION_DEFAULT})"
|
|
||||||
echo "FILE_NAME_ROOT - name of the archive, minus extensions"
|
|
||||||
echo " (defaults to PROJECT_NAME-VERSION)"
|
|
||||||
echo "REPO_ROOT - the location of the Git repository to archive"
|
|
||||||
echo " (defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
|
|
||||||
echo "TO_COMPRESS - what part of clone to pack"
|
|
||||||
echo " (defaults to ${VERSION})"
|
|
||||||
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
|
|
||||||
echo " (defaults to packaged JDK version)"
|
|
||||||
echo "WITH_TEMP - run in a temporary directory"
|
|
||||||
echo " (defaults to disabled)"
|
|
||||||
echo "OPENJDK_LATEST - deduce VERSION from most recent upstream tag"
|
|
||||||
echo " (implies WITH_TEMP, computes everything else"
|
|
||||||
echo " automatically; Note: accesses network to read"
|
|
||||||
echo " tag list from remote Git repository)"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$OPENJDK_LATEST" != "" ] ; then
|
|
||||||
FEATURE_VERSION=$(echo '%featurever' \
|
|
||||||
| rpmspec --shell ./*.spec 2>/dev/null \
|
|
||||||
| grep --after-context 1 featurever \
|
|
||||||
| tail --lines 1)
|
|
||||||
PROJECT_NAME=openjdk
|
|
||||||
REPO_NAME=jdk"${FEATURE_VERSION}"u
|
|
||||||
# Skip -ga tags since those are the same as the most recent non-ga tag, and
|
|
||||||
# the non-ga tag is the one that is used to generated the official source
|
|
||||||
# tarball. For example:
|
|
||||||
# ca760c86642aa2e0d9b571aaabac054c0239fbdc refs/tags/jdk-17.0.10-ga^{}
|
|
||||||
# 25a2e6c20c9a96853714284cabc6b456eb095070 refs/tags/jdk-17.0.10-ga
|
|
||||||
# ca760c86642aa2e0d9b571aaabac054c0239fbdc refs/tags/jdk-17.0.10+7^{}
|
|
||||||
# e49c5749b10f3e90274b72e9279f794fdd191d27 refs/tags/jdk-17.0.10+7
|
|
||||||
VERSION=$(git ls-remote --tags --refs --sort=-version:refname \
|
|
||||||
"${OPENJDK_URL_DEFAULT}/${PROJECT_NAME}/${REPO_NAME}.git" \
|
|
||||||
"jdk-${FEATURE_VERSION}*" \
|
|
||||||
| grep --invert-match '\-ga$' \
|
|
||||||
| head --lines 1 | cut --characters 52-)
|
|
||||||
FILE_NAME_ROOT=open${VERSION}
|
|
||||||
WITH_TEMP=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$WITH_TEMP" != "" ] ; then
|
|
||||||
pushd "$(mktemp --directory --tmpdir temp-generated-source-tarball-XXX)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$VERSION" = "" ] ; then
|
|
||||||
echo "No VERSION specified"
|
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
echo "Version: ${VERSION}"
|
|
||||||
|
|
||||||
NUM_VER=${VERSION##jdk-}
|
|
||||||
RELEASE_VER=${NUM_VER%%+*}
|
|
||||||
BUILD_VER=${NUM_VER##*+}
|
|
||||||
MAJOR_VER=${RELEASE_VER%%.*}
|
|
||||||
echo "Major version is ${MAJOR_VER}, release ${RELEASE_VER}, build ${BUILD_VER}"
|
|
||||||
|
|
||||||
if [ "$BOOT_JDK" = "" ] ; then
|
|
||||||
echo "No boot JDK specified".
|
|
||||||
BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
|
|
||||||
echo -n "Checking for ${BOOT_JDK}...";
|
|
||||||
if [ -d "${BOOT_JDK}" ] && [ -x "${BOOT_JDK}"/bin/java ] ; then
|
|
||||||
echo "Boot JDK found at ${BOOT_JDK}";
|
|
||||||
else
|
|
||||||
echo "Not found";
|
|
||||||
PREV_VER=$((MAJOR_VER - 1));
|
|
||||||
BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
|
|
||||||
echo -n "Checking for ${BOOT_JDK}...";
|
|
||||||
if [ -d ${BOOT_JDK} ] && [ -x ${BOOT_JDK}/bin/java ] ; then
|
|
||||||
echo "Boot JDK found at ${BOOT_JDK}";
|
|
||||||
else
|
|
||||||
echo "Not found";
|
|
||||||
exit 4;
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Boot JDK: ${BOOT_JDK}";
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$OPENJDK_URL" = "" ] ; then
|
|
||||||
OPENJDK_URL=${OPENJDK_URL_DEFAULT}
|
|
||||||
echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
|
|
||||||
else
|
|
||||||
echo "OpenJDK URL: ${OPENJDK_URL}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$COMPRESSION" = "" ] ; then
|
|
||||||
# rhel 5 needs tar.gz
|
|
||||||
COMPRESSION=${COMPRESSION_DEFAULT}
|
|
||||||
fi
|
|
||||||
echo "Creating a tar.${COMPRESSION} archive"
|
|
||||||
|
|
||||||
if [ "$FILE_NAME_ROOT" = "" ] ; then
|
|
||||||
if [ "$PROJECT_NAME" = "" ] ; then
|
|
||||||
echo "No PROJECT_NAME specified, needed by FILE_NAME_ROOT"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
FILE_NAME_ROOT=${PROJECT_NAME}-${VERSION}
|
|
||||||
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
|
|
||||||
fi
|
|
||||||
if [ "$REPO_ROOT" = "" ] ; then
|
|
||||||
if [ "$PROJECT_NAME" = "" ] ; then
|
|
||||||
echo "No PROJECT_NAME specified, needed by REPO_ROOT"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ "$REPO_NAME" = "" ] ; then
|
|
||||||
echo "No REPO_NAME specified, needed by REPO_ROOT"
|
|
||||||
exit 3
|
|
||||||
fi
|
|
||||||
REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
|
|
||||||
echo "No repository root specified; default to ${REPO_ROOT}"
|
|
||||||
fi;
|
|
||||||
|
|
||||||
if [ "$TO_COMPRESS" = "" ] ; then
|
|
||||||
TO_COMPRESS="${VERSION}"
|
|
||||||
echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
|
|
||||||
fi;
|
|
||||||
|
|
||||||
echo -e "Settings:"
|
|
||||||
echo -e "\tVERSION: ${VERSION}"
|
|
||||||
echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
|
|
||||||
echo -e "\tREPO_NAME: ${REPO_NAME}"
|
|
||||||
echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
|
|
||||||
echo -e "\tCOMPRESSION: ${COMPRESSION}"
|
|
||||||
echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
|
|
||||||
echo -e "\tREPO_ROOT: ${REPO_ROOT}"
|
|
||||||
echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
|
|
||||||
echo -e "\tBOOT_JDK: ${BOOT_JDK}"
|
|
||||||
echo -e "\tWITH_TEMP: ${WITH_TEMP}"
|
|
||||||
echo -e "\tOPENJDK_LATEST: ${OPENJDK_LATEST}"
|
|
||||||
|
|
||||||
if [ -d "${FILE_NAME_ROOT}" ] ; then
|
|
||||||
echo "Reusing existing ${FILE_NAME_ROOT}"
|
|
||||||
STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
|
|
||||||
TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
|
|
||||||
else
|
|
||||||
mkdir "${FILE_NAME_ROOT}"
|
|
||||||
pushd "${FILE_NAME_ROOT}"
|
|
||||||
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
|
|
||||||
if realpath -q "${REPO_ROOT}"; then
|
|
||||||
echo "Local path detected; not adding depth argument";
|
|
||||||
DEPTH="--";
|
|
||||||
else
|
|
||||||
DEPTH="--depth=1";
|
|
||||||
echo "Remote repository detected; adding ${DEPTH}";
|
|
||||||
fi
|
|
||||||
git clone -b "${VERSION}" "${DEPTH}" "${REPO_ROOT}" "${VERSION}"
|
|
||||||
pushd "${VERSION}"
|
|
||||||
TAR_TIME="$(git log --max-count 1 --format=%cI)"
|
|
||||||
popd
|
|
||||||
popd
|
|
||||||
fi
|
|
||||||
pushd "${FILE_NAME_ROOT}"
|
|
||||||
# Generate .src-rev so build has knowledge of the revision the tarball was
|
|
||||||
# created from
|
|
||||||
mkdir build
|
|
||||||
pushd build
|
|
||||||
sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
|
|
||||||
make store-source-revision
|
|
||||||
popd
|
|
||||||
rm -rf build
|
|
||||||
|
|
||||||
# Remove commit checks
|
|
||||||
echo "Removing $(find "${VERSION}" -name '.jcheck' -print)"
|
|
||||||
find "${VERSION}" -name '.jcheck' -print0 | xargs -0 rm -r
|
|
||||||
|
|
||||||
# Remove history and GHA
|
|
||||||
echo "find ${VERSION} -name '.hgtags'"
|
|
||||||
find "${VERSION}" -name '.hgtags' -exec rm -v '{}' '+'
|
|
||||||
echo "find ${VERSION} -name '.hgignore'"
|
|
||||||
find "${VERSION}" -name '.hgignore' -exec rm -v '{}' '+'
|
|
||||||
echo "find ${VERSION} -name '.gitattributes'"
|
|
||||||
find "${VERSION}" -name '.gitattributes' -exec rm -v '{}' '+'
|
|
||||||
echo "find ${VERSION} -name '.gitignore'"
|
|
||||||
find "${VERSION}" -name '.gitignore' -exec rm -v '{}' '+'
|
|
||||||
# Work around some Git objects not having write permissions.
|
|
||||||
echo "chmod --recursive u+w ${VERSION}/.git"
|
|
||||||
chmod --recursive u+w "${VERSION}"/.git
|
|
||||||
echo "find ${VERSION} -name '.git'"
|
|
||||||
find "${VERSION}" -name '.git' -exec rm -rv '{}' '+'
|
|
||||||
echo "find ${VERSION} -name '.github'"
|
|
||||||
find "${VERSION}" -name '.github' -exec rm -rv '{}' '+'
|
|
||||||
|
|
||||||
echo "Compressing remaining forest"
|
|
||||||
if [ "$COMPRESSION" = "xz" ] ; then
|
|
||||||
SWITCH=cJf
|
|
||||||
else
|
|
||||||
SWITCH=czf
|
|
||||||
fi
|
|
||||||
EA_PART="$(awk -F= \
|
|
||||||
'/^DEFAULT_PROMOTED_VERSION_PRE/ { if ($2) print "-"$2 }' \
|
|
||||||
"${VERSION}"/make/conf/version-numbers.conf)"
|
|
||||||
TARBALL_NAME=${FILE_NAME_ROOT}${EA_PART}.tar.${COMPRESSION}
|
|
||||||
XZ_OPT=${XZ_OPT-"-T0"} \
|
|
||||||
tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \
|
|
||||||
--exclude-vcs -$SWITCH "${TARBALL_NAME}" "${TO_COMPRESS}"
|
|
||||||
mv "${TARBALL_NAME}" ..
|
|
||||||
popd
|
|
||||||
if [ "$WITH_TEMP" != "" ] ; then
|
|
||||||
echo "Tarball is: $(realpath .)/${TARBALL_NAME}"
|
|
||||||
popd
|
|
||||||
else
|
|
||||||
echo -n "Done. You may want to remove the uncompressed version"
|
|
||||||
echo " - $FILE_NAME_ROOT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# compile-command: "shellcheck generate_source_tarball.sh"
|
|
||||||
# fill-column: 80
|
|
||||||
# indent-tabs-mode: nil
|
|
||||||
# sh-basic-offset: 4
|
|
||||||
# End:
|
|
||||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||||
SHA512 (openjdk-21.0.5+11.tar.xz) = f416e746593589cc7d37dbde55098038412939947c41c05baf2da31e44c42d0242cb8f6a4a5659d3d7b9a27e775d9ef375f754acda5e143ada5987e288dbe87a
|
SHA512 (openjdk-jdk19u-jdk-19.0.2+7.tar.xz) = f9b54ae43074caa53773000ed8000ff5592cda44b2bef8fafa2c38cf623048722c34a111aacfd1831050525804230b29cc20fd95ad2162c43412b957190cc7b0
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user