updated to 17.0.7.0.7 underlying portables
- requirign 17.0.7.0.7-2 due to news, and much more tuning - now untarring enforced version - repacked bits are now requested in exact version - repacked portables - using icons from source package - providing full sources via src package - requiring exact version.reelase of portables - todo, lost alt java manpage.. probably already in portables - TODO conslut this clean up - javdoc - todo, debuginfo
This commit is contained in:
Jiri
parent
32e1bc999a
commit
0180d4e988
File diff suppressed because it is too large
Load Diff
@ -1,200 +0,0 @@
|
|||||||
#!/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 GH001, set the path to it in the GH001 variable
|
|
||||||
#
|
|
||||||
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
|
||||||
# PROJECT_NAME=openjdk
|
|
||||||
# REPO_NAME=jdk11u
|
|
||||||
# VERSION=HEAD
|
|
||||||
# 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$GH001" = "x" ] ; then
|
|
||||||
if [ ! -f "$GH001" ] ; then
|
|
||||||
echo "You have specified GH001 as $GH001 but it does not exist. Exiting"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! "x$GH003" = "x" ] ; then
|
|
||||||
if [ ! -f "$GH003" ] ; then
|
|
||||||
echo "You have specified GH003 as $GH003 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=6.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 "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
|
|
||||||
echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
|
|
||||||
echo "GH001 - the path to the ECC code patch, GH001, to apply (optional; downloaded if unavailable)"
|
|
||||||
echo "GH003 - the path to the ECC test patch, GH003, to apply (optional; downloaded if unavailable)"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if [ "x$VERSION" = "x" ] ; then
|
|
||||||
echo "No VERSION specified"
|
|
||||||
exit -2
|
|
||||||
fi
|
|
||||||
echo "Version: ${VERSION}"
|
|
||||||
|
|
||||||
# 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 to be compressed targets 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 "\tGH001: ${GH001}"
|
|
||||||
echo -e "\tGH003: ${GH003}"
|
|
||||||
|
|
||||||
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}"
|
|
||||||
# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free
|
|
||||||
if [ -d openjdk/test ] ; then
|
|
||||||
echo "Removing langtools test case with non-Free license"
|
|
||||||
rm -vf openjdk/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
|
|
||||||
fi
|
|
||||||
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$GH001" = "x" ] ; then
|
|
||||||
# get gh001-4curve.patch (from https://github.com/icedtea-git/icedtea) in the ${ICEDTEA_VERSION} branch
|
|
||||||
# Do not push it or publish it
|
|
||||||
echo "GH001 not found. Downloading..."
|
|
||||||
wget -v https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/gh001-4curve.patch
|
|
||||||
echo "Applying ${PWD}/gh001-4curve.patch"
|
|
||||||
git apply --stat --apply -v -p1 gh001-4curve.patch
|
|
||||||
rm gh001-4curve.patch
|
|
||||||
else
|
|
||||||
echo "Applying ${GH001}"
|
|
||||||
git apply --stat --apply -v -p1 $GH001
|
|
||||||
fi;
|
|
||||||
if [ "x$GH003" = "x" ] ; then
|
|
||||||
# get gh001-4curve.patch (from https://github.com/icedtea-git/icedtea) in the ${ICEDTEA_VERSION} branch
|
|
||||||
echo "GH003 not found. Downloading..."
|
|
||||||
wget -v https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/gh003-4curve.patch
|
|
||||||
echo "Applying ${PWD}/gh003-4curve.patch"
|
|
||||||
git apply --stat --apply -v -p1 gh003-4curve.patch
|
|
||||||
rm gh003-4curve.patch
|
|
||||||
else
|
|
||||||
echo "Applying ${GH003}"
|
|
||||||
git apply --stat --apply -v -p1 $GH003
|
|
||||||
fi;
|
|
||||||
find . -name '*.orig' -exec rm -vf '{}' ';' || echo "No .orig files found. This is suspicious, but may happen."
|
|
||||||
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
|
|
||||||
make store-source-revision
|
|
||||||
popd
|
|
||||||
rm -rf build
|
|
||||||
|
|
||||||
echo "Compressing remaining forest"
|
|
||||||
if [ "X$COMPRESSION" = "Xxz" ] ; then
|
|
||||||
SWITCH=cJf
|
|
||||||
else
|
|
||||||
SWITCH=czf
|
|
||||||
fi
|
|
||||||
TARBALL_NAME=${FILE_NAME_ROOT}-4curve.tar.${COMPRESSION}
|
|
||||||
tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
|
|
||||||
mv ${TARBALL_NAME} ..
|
|
||||||
popd
|
|
||||||
echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
|
|
||||||
1064
java-11-openjdk.spec
1064
java-11-openjdk.spec
File diff suppressed because it is too large
Load Diff
@ -1,5 +0,0 @@
|
|||||||
name = NSS
|
|
||||||
nssLibraryDirectory = @NSS_LIBDIR@
|
|
||||||
nssDbMode = noDb
|
|
||||||
attributes = compatibility
|
|
||||||
handleStartupErrors = ignoreMultipleInitialisation
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
name = NSS-FIPS
|
|
||||||
nssLibraryDirectory = @NSS_LIBDIR@
|
|
||||||
nssSecmodDirectory = sql:/etc/pki/nssdb
|
|
||||||
nssDbMode = readOnly
|
|
||||||
nssModule = fips
|
|
||||||
|
|
||||||
attributes(*,CKO_SECRET_KEY,CKK_GENERIC_SECRET)={ CKA_SIGN=true }
|
|
||||||
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Copyright (C) 2022 Red Hat, Inc.
|
|
||||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>, 2012-2022
|
|
||||||
#
|
|
||||||
# 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/>.
|
|
||||||
|
|
||||||
OLD_RELEASE=$1
|
|
||||||
NEW_RELEASE=$2
|
|
||||||
SUBDIR=$3
|
|
||||||
REPO=$4
|
|
||||||
SCRIPT_DIR=$(dirname ${0})
|
|
||||||
|
|
||||||
if test "x${SUBDIR}" = "x"; then
|
|
||||||
echo "No subdirectory specified; using .";
|
|
||||||
SUBDIR=".";
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$REPO" = "x"; then
|
|
||||||
echo "No repository specified; using ${PWD}"
|
|
||||||
REPO=${PWD}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x${TMPDIR} = x; then
|
|
||||||
TMPDIR=/tmp;
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Repository: ${REPO}"
|
|
||||||
|
|
||||||
if [ -e ${REPO}/.git ] ; then
|
|
||||||
TYPE=git;
|
|
||||||
elif [ -e ${REPO}/.hg ] ; then
|
|
||||||
TYPE=hg;
|
|
||||||
else
|
|
||||||
echo "No Mercurial or Git repository detected.";
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$OLD_RELEASE" = "x" || test "x$NEW_RELEASE" = "x"; then
|
|
||||||
echo "ERROR: Need to specify old and new release";
|
|
||||||
exit 2;
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
|
|
||||||
rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 ${TMPDIR}/fixes
|
|
||||||
for repos in . $(${SCRIPT_DIR}/discover_trees.sh ${REPO});
|
|
||||||
do
|
|
||||||
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} | \
|
|
||||||
egrep '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])# - JDK-\1#'| \
|
|
||||||
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} | \
|
|
||||||
egrep '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})# - JDK-\1#' >> ${TMPDIR}/fixes3;
|
|
||||||
else
|
|
||||||
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;
|
|
||||||
touch ${TMPDIR}/fixes3 ; # unused
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
sort ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 | uniq > ${TMPDIR}/fixes
|
|
||||||
rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3
|
|
||||||
|
|
||||||
echo "In ${TMPDIR}/fixes:"
|
|
||||||
cat ${TMPDIR}/fixes
|
|
||||||
@ -1,166 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Arguments: <JDK TREE> <MINIMAL|FULL>
|
|
||||||
TREE=${1}
|
|
||||||
TYPE=${2}
|
|
||||||
|
|
||||||
ZIP_SRC=src/java.base/share/native/libzip/zlib/
|
|
||||||
FREETYPE_SRC=src/java.desktop/share/native/libfreetype/
|
|
||||||
JPEG_SRC=src/java.desktop/share/native/libjavajpeg/
|
|
||||||
GIF_SRC=src/java.desktop/share/native/libsplashscreen/giflib/
|
|
||||||
PNG_SRC=src/java.desktop/share/native/libsplashscreen/libpng/
|
|
||||||
LCMS_SRC=src/java.desktop/share/native/liblcms/
|
|
||||||
|
|
||||||
if test "x${TREE}" = "x"; then
|
|
||||||
echo "$0 <JDK_TREE> (MINIMAL|FULL)";
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${TYPE}" = "x"; then
|
|
||||||
TYPE=minimal;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${TYPE}" != "xminimal" -a "x${TYPE}" != "xfull"; then
|
|
||||||
echo "Type must be minimal or full";
|
|
||||||
exit 2;
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Removing in-tree libraries from ${TREE}"
|
|
||||||
echo "Cleansing operation: ${TYPE}";
|
|
||||||
|
|
||||||
cd ${TREE}
|
|
||||||
|
|
||||||
echo "Removing built-in libs (they will be linked)"
|
|
||||||
|
|
||||||
# On full runs, allow for zlib & freetype having already been deleted by minimal
|
|
||||||
echo "Removing zlib"
|
|
||||||
if [ "x${TYPE}" = "xminimal" -a ! -d ${ZIP_SRC} ]; then
|
|
||||||
echo "${ZIP_SRC} does not exist. Refusing to proceed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
rm -rvf ${ZIP_SRC}
|
|
||||||
echo "Removing freetype"
|
|
||||||
if [ "x${TYPE}" = "xminimal" -a ! -d ${FREETYPE_SRC} ]; then
|
|
||||||
echo "${FREETYPE_SRC} does not exist. Refusing to proceed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
rm -rvf ${FREETYPE_SRC}
|
|
||||||
|
|
||||||
# Minimal is limited to just zlib and freetype so finish here
|
|
||||||
if test "x${TYPE}" = "xminimal"; then
|
|
||||||
echo "Finished.";
|
|
||||||
exit 0;
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Removing libjpeg"
|
|
||||||
if [ ! -f ${JPEG_SRC}/jdhuff.c ]; then # some file that should definitely exist
|
|
||||||
echo "${JPEG_SRC} does not contain jpeg sources. Refusing to proceed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -vf ${JPEG_SRC}/jcomapi.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdapimin.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdapistd.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdcoefct.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdcolor.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdct.h
|
|
||||||
rm -vf ${JPEG_SRC}/jddctmgr.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdhuff.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdhuff.h
|
|
||||||
rm -vf ${JPEG_SRC}/jdinput.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdmainct.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdmarker.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdmaster.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdmerge.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdphuff.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdpostct.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdsample.c
|
|
||||||
rm -vf ${JPEG_SRC}/jerror.c
|
|
||||||
rm -vf ${JPEG_SRC}/jerror.h
|
|
||||||
rm -vf ${JPEG_SRC}/jidctflt.c
|
|
||||||
rm -vf ${JPEG_SRC}/jidctfst.c
|
|
||||||
rm -vf ${JPEG_SRC}/jidctint.c
|
|
||||||
rm -vf ${JPEG_SRC}/jidctred.c
|
|
||||||
rm -vf ${JPEG_SRC}/jinclude.h
|
|
||||||
rm -vf ${JPEG_SRC}/jmemmgr.c
|
|
||||||
rm -vf ${JPEG_SRC}/jmemsys.h
|
|
||||||
rm -vf ${JPEG_SRC}/jmemnobs.c
|
|
||||||
rm -vf ${JPEG_SRC}/jmorecfg.h
|
|
||||||
rm -vf ${JPEG_SRC}/jpegint.h
|
|
||||||
rm -vf ${JPEG_SRC}/jpeglib.h
|
|
||||||
rm -vf ${JPEG_SRC}/jquant1.c
|
|
||||||
rm -vf ${JPEG_SRC}/jquant2.c
|
|
||||||
rm -vf ${JPEG_SRC}/jutils.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcapimin.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcapistd.c
|
|
||||||
rm -vf ${JPEG_SRC}/jccoefct.c
|
|
||||||
rm -vf ${JPEG_SRC}/jccolor.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcdctmgr.c
|
|
||||||
rm -vf ${JPEG_SRC}/jchuff.c
|
|
||||||
rm -vf ${JPEG_SRC}/jchuff.h
|
|
||||||
rm -vf ${JPEG_SRC}/jcinit.c
|
|
||||||
rm -vf ${JPEG_SRC}/jconfig.h
|
|
||||||
rm -vf ${JPEG_SRC}/jcmainct.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcmarker.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcmaster.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcparam.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcphuff.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcprepct.c
|
|
||||||
rm -vf ${JPEG_SRC}/jcsample.c
|
|
||||||
rm -vf ${JPEG_SRC}/jctrans.c
|
|
||||||
rm -vf ${JPEG_SRC}/jdtrans.c
|
|
||||||
rm -vf ${JPEG_SRC}/jfdctflt.c
|
|
||||||
rm -vf ${JPEG_SRC}/jfdctfst.c
|
|
||||||
rm -vf ${JPEG_SRC}/jfdctint.c
|
|
||||||
rm -vf ${JPEG_SRC}/jversion.h
|
|
||||||
rm -vf ${JPEG_SRC}/README
|
|
||||||
|
|
||||||
echo "Removing giflib"
|
|
||||||
if [ ! -d ${GIF_SRC} ]; then
|
|
||||||
echo "${GIF_SRC} does not exist. Refusing to proceed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
rm -rvf ${GIF_SRC}
|
|
||||||
|
|
||||||
echo "Removing libpng"
|
|
||||||
if [ ! -d ${PNG_SRC} ]; then
|
|
||||||
echo "${PNG_SRC} does not exist. Refusing to proceed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
rm -rvf ${PNG_SRC}
|
|
||||||
|
|
||||||
echo "Removing lcms"
|
|
||||||
if [ ! -d ${LCMS_SRC} ]; then
|
|
||||||
echo "${LCMS_SRC} does not exist. Refusing to proceed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
rm -vf ${LCMS_SRC}/cmscam02.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmscgats.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmscnvrt.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmserr.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsgamma.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsgmt.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmshalf.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsintrp.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsio0.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsio1.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmslut.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsmd5.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsmtrx.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsnamed.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsopt.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmspack.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmspcs.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsplugin.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsps2.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmssamp.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmssm.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmstypes.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsvirt.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmswtpnt.c
|
|
||||||
rm -vf ${LCMS_SRC}/cmsxform.c
|
|
||||||
rm -vf ${LCMS_SRC}/lcms2.h
|
|
||||||
rm -vf ${LCMS_SRC}/lcms2_internal.h
|
|
||||||
rm -vf ${LCMS_SRC}/lcms2_plugin.h
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
diff -uNr openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java jdk8/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
|
|
||||||
--- openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
|
|
||||||
+++ openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
|
|
||||||
@@ -883,9 +883,13 @@
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (!GraphicsEnvironment.isHeadless()) {
|
|
||||||
- loadAssistiveTechnologies();
|
|
||||||
+ try {
|
|
||||||
+ loadAssistiveTechnologies();
|
|
||||||
+ } catch (AWTError error) {
|
|
||||||
+ // ignore silently
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return toolkit;
|
|
||||||
}
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
|
|
||||||
index 474fe6f401f..7e94ae32023 100644
|
|
||||||
--- a/src/java.base/share/conf/security/java.security
|
|
||||||
+++ b/src/java.base/share/conf/security/java.security
|
|
||||||
@@ -84,6 +84,7 @@ security.provider.tbd=Apple
|
|
||||||
#ifndef solaris
|
|
||||||
security.provider.tbd=SunPKCS11
|
|
||||||
#endif
|
|
||||||
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
|
||||||
|
|
||||||
#
|
|
||||||
# Security providers used when FIPS mode support is active
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
--- 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
|
|
||||||
@ -1,116 +0,0 @@
|
|||||||
diff -r 1356affa5e44 make/launcher/Launcher-java.base.gmk
|
|
||||||
--- openjdk/make/launcher/Launcher-java.base.gmk Wed Nov 25 08:27:15 2020 +0100
|
|
||||||
+++ openjdk/make/launcher/Launcher-java.base.gmk Tue Dec 01 12:29:30 2020 +0100
|
|
||||||
@@ -41,6 +41,16 @@
|
|
||||||
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, \
|
|
||||||
+ LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \
|
|
||||||
+ LIBS_windows := user32.lib comctl32.lib, \
|
|
||||||
+ EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
|
|
||||||
+ VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
|
|
||||||
+ OPTIMIZATION := HIGH, \
|
|
||||||
+))
|
|
||||||
+
|
|
||||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
|
||||||
$(eval $(call SetupBuildLauncher, javaw, \
|
|
||||||
CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
|
|
||||||
|
|
||||||
diff -r 25e94aa812b2 src/share/bin/alt_main.h
|
|
||||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
||||||
+++ openjdk/src/java.base/share/native/launcher/alt_main.h Tue Jun 02 17:15:28 2020 +0100
|
|
||||||
@@ -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 -r 25e94aa812b2 src/share/bin/main.c
|
|
||||||
--- openjdk/src/java.base/share/native/launcher/main.c Wed Feb 05 12:20:36 2020 -0300
|
|
||||||
+++ openjdk/src/java.base/share/native/launcher/main.c Tue Jun 02 17:15:28 2020 +0100
|
|
||||||
@@ -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
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff --git openjdk.orig/src/java.base/share/classes/sun/security/tools/keytool/Main.java openjdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
|
|
||||||
--- openjdk.orig/src/java.base/share/classes/sun/security/tools/keytool/Main.java
|
|
||||||
+++ openjdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
|
|
||||||
@@ -1135,7 +1135,7 @@
|
|
||||||
}
|
|
||||||
} else if (command == GENKEYPAIR) {
|
|
||||||
if (keyAlgName == null) {
|
|
||||||
- keyAlgName = "DSA";
|
|
||||||
+ keyAlgName = "RSA";
|
|
||||||
}
|
|
||||||
doGenKeyPair(alias, dname, keyAlgName, keysize, groupName, sigAlgName);
|
|
||||||
kssave = true;
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
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
sources
1
sources
@ -1,2 +1 @@
|
|||||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||||
SHA512 (openjdk-jdk11u-jdk-11.0.18+10-4curve.tar.xz) = c946ec14e1fb4ec40269e0928734368a6d68712549ae450e346d53ab1ae553a280402c6c7e346c859a3e65ec83fc1adefbad733fe8d5e89f0b6d43314558a0b5
|
|
||||||
|
|||||||
@ -1,42 +0,0 @@
|
|||||||
#!/bin/bash -x
|
|
||||||
# this file contains defaults for currently generated source tarballs
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# OpenJDK from Shenandoah project
|
|
||||||
export PROJECT_NAME="shenandoah"
|
|
||||||
export REPO_NAME="jdk11"
|
|
||||||
# warning, clonning without shenadnaoh prefix, you will clone pure jdk - thus without shenandaoh GC
|
|
||||||
export VERSION="shenandoah-jdk-11.0.3+7"
|
|
||||||
export COMPRESSION=xz
|
|
||||||
# unset tapsets overrides
|
|
||||||
export OPENJDK_URL=""
|
|
||||||
export TO_COMPRESS=""
|
|
||||||
# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
|
|
||||||
export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
|
|
||||||
FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
|
|
||||||
|
|
||||||
if [ ! -f ${FILENAME} ] ; then
|
|
||||||
echo "Generating ${FILENAME}"
|
|
||||||
sh ./generate_source_tarball.sh
|
|
||||||
else
|
|
||||||
echo "exists exists exists exists exists exists exists "
|
|
||||||
echo "reusing reusing reusing reusing reusing reusing "
|
|
||||||
echo ${FILENAME}
|
|
||||||
fi
|
|
||||||
|
|
||||||
set +e
|
|
||||||
|
|
||||||
major=`echo $REPO_NAME | sed 's/[a-zA-Z]*//g'`
|
|
||||||
build=`echo $VERSION | sed 's/.*+//g'`
|
|
||||||
name_helper=`echo $FILENAME | sed s/$major/'%{majorver}'/g `
|
|
||||||
name_helper=`echo $name_helper | sed s/$build/'%{buildver}'/g `
|
|
||||||
echo "align specfile acordingly:"
|
|
||||||
echo " sed 's/^Source0:.*/Source0: $name_helper/' -i *.spec"
|
|
||||||
echo " sed 's/^Source8:.*/Source8: $TAPSET/' -i *.spec"
|
|
||||||
echo " sed 's/^%global buildver.*/%global buildver $build/' -i *.spec"
|
|
||||||
echo " sed 's/Release:.*/Release: 1%{?dist}/' -i *.spec"
|
|
||||||
echo "and maybe others...."
|
|
||||||
echo "you should fedpkg/rhpkg new-sources $TAPSET $FILENAME"
|
|
||||||
echo "you should fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user