$ git show --format=fuller --patch-with-stat --summary eab9c00fb4b7be204fc51340e7ecc5ba734d9d69

commit eab9c00fb4b7be204fc51340e7ecc5ba734d9d69
Author:     Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Thu Aug 26 04:30:44 2021 +0200
Commit:     Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Thu Aug 26 04:30:44 2021 +0200

    15.0.5, switch to getting sources from git, fix build with glibc 2.34, disable system_jdk (we're switching to 16/17)
---
 .abf.yml                                           |   2 +-
 generate_source_tarball.sh                         | 132 -------------------
 java-15-openjdk.spec                               |  21 ++-
 openjdk-16-glibc-2.34.patch                        |  14 ++
 remove-intree-libraries.sh                         | 145 ---------------------
 ...ted_out_nss_cfg_provider_to_java_security.patch |   7 -
 6 files changed, 25 insertions(+), 296 deletions(-)
 delete mode 100755 generate_source_tarball.sh
 create mode 100644 openjdk-16-glibc-2.34.patch
 delete mode 100755 remove-intree-libraries.sh

diff --git a/.abf.yml b/.abf.yml
index b144342..99f4035 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  jdk-updates-jdk15u-jdk-15-ga.tar.zst: 3d2ebf3772d279c383c57d04f527ed1c0a61c513
+  jdk-15.0.5+1.tar.gz: 2802a74cfb6c08acfb97baaf1d9482b1e326d80f
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
deleted file mode 100755
index 2888e0e..0000000
--- a/generate_source_tarball.sh
+++ /dev/null
@@ -1,132 +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, you may be enough by setting OPENJDK_URL
-#
-# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
-# PROJECT_NAME=jdk
-# REPO_NAME=jdk
-# VERSION=tip
-# 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
-#
-
-set -e
-
-OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
-COMPRESSION_DEFAULT=zst
-
-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)"
-    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}"
-    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;
-
-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}"
-    hg clone ${REPO_ROOT} openjdk -r ${VERSION}
-  popd
-fi
-
-if [ "$PROJECT_NAME" != "hg" ]; then
-	echo "Removing in-tree libraries"
-	OURDIR=$(realpath $(dirname $0))
-	cd ${FILE_NAME_ROOT}
-	$OURDIR/remove-intree-libraries.sh
-	cd ..
-fi
-
-pushd "${FILE_NAME_ROOT}"
-    echo "Compressing remaining forest"
-    if [ "X$COMPRESSION" = "Xxz" ] ; then
-        SWITCH=cJf
-	SUFFIX=".${COMPRESSION}"
-    elif [ "X$COMPRESSION" = "Xzst" ]; then
-        SWITCH=cf
-        SUFFIX=""
-    else
-        SWITCH=czf
-	SUFFIX=".${COMPRESSION}"
-    fi
-    tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar${SUFFIX} $TO_COMPRESS
-    [ "X$COMPRESSION" = "Xzst" ] && zstd -19 --rm ${FILE_NAME_ROOT}.tar
-    mv ${FILE_NAME_ROOT}.tar.${COMPRESSION}  ..
-popd
-echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
-
-
diff --git a/java-15-openjdk.spec b/java-15-openjdk.spec
index ae36ba9..87dd1b5 100644
--- a/java-15-openjdk.spec
+++ b/java-15-openjdk.spec
@@ -1,6 +1,6 @@
 # Use gcc instead of clang
 %bcond_with gcc
-%bcond_without system_jdk
+%bcond_with system_jdk
 # Without bootstrap, the package BuildRequires
 # rpm-javamacros (which in turn requires this package)
 # so jmod(*) and java(*) Provides: can be generated correctly.
@@ -9,8 +9,9 @@
 # packages various shared library files inside zip (jmod) packages.
 # Those aren't seen by the splitter and therefore get insanely large.
 # Better to use OpenJDK's own debuginfo splitter here even if it
-# results in somewhat nonstandard locations for debuginfo files.
-%global debug_package %{nil}
+# results in somewhat nonstandard locations for debuginfo files that
+# rpm's package generator doesn't fully catch
+%global _empty_manifest_terminate_build 0
 
 # OpenJDK builds a lot of underlinked libraries and tools...
 %global _disable_ld_no_undefined 1
@@ -26,21 +27,16 @@
 %define oldmajor %(echo $((%{major}-1)))
 
 Name:		java-15-openjdk
-Version:	15.0.0
+Version:	15.0.5
 Release:	1
 Summary:	Java Runtime Environment (JRE) %{major}
 Group:		Development/Languages
 License:	GPLv2, ASL 1.1, ASL 2.0, LGPLv2.1
 URL:		http://openjdk.java.net/
-# Source must be packages from upstream's hg repositories using the
-# update_package.sh script
-# PROJECT_NAME=jdk-updates REPO_NAME=jdk14u VERSION=jdk-14+36 ./generate_source_tarball.sh
-Source0:	jdk-updates-jdk%{major}u-jdk-%{major}-ga.tar.zst
+Source0:	https://github.com/openjdk/jdk15u/archive/refs/tags/jdk-%{version}+1.tar.gz
 # Extra tests
 Source50:	TestCryptoLevel.java
 Source51:	TestECDSA.java
-# Used to create source tarballs - not used by the rpm build process itself
-Source100:	remove-intree-libraries.sh
 # Patches from Fedora
 Patch0:		https://src.fedoraproject.org/rpms/java-openjdk/raw/master/f/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
 Patch1:		https://src.fedoraproject.org/rpms/java-openjdk/raw/master/f/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
@@ -51,6 +47,7 @@ Patch4:		https://src.fedoraproject.org/rpms/java-openjdk/raw/master/f/pr3183-rh1
 Patch1002:	java-12-compile.patch
 Patch1003:	openjdk-15-nss-3.57.patch
 Patch1004:	openjdk-12-system-harfbuzz.patch
+Patch1005:	openjdk-16-glibc-2.34.patch
 #Patch1005:	openjdk-13-fix-build.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -185,7 +182,9 @@ Group:		Development/Debug
 Debug information for package %{name}
 
 %prep
-%autosetup -p1 -n openjdk
+%autosetup -p1 -n jdk15u-jdk-%{version}-1
+# We use system libs
+rm -rf src/java.desktop/share/native/libfontmanager/harfbuzz
 
 EXTRA_CFLAGS="$(echo %{optflags} -fuse-ld=bfd -Wno-error -fno-delete-null-pointer-checks -Wformat -Wno-cpp -DSYSTEM_NSS -I%{_includedir}/nss -I%{_includedir}/nspr4 |sed -r -e 's|-O[0-9sz]*||;s|-Werror=format-security||g')"
 EXTRA_CXXFLAGS="$EXTRA_CFLAGS"
diff --git a/openjdk-16-glibc-2.34.patch b/openjdk-16-glibc-2.34.patch
new file mode 100644
index 0000000..b7c4f3c
--- /dev/null
+++ b/openjdk-16-glibc-2.34.patch
@@ -0,0 +1,14 @@
+diff -up openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c.8~ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
+--- openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c.8~	2021-08-25 22:18:29.985273769 +0200
++++ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c	2021-08-25 22:19:22.321395441 +0200
+@@ -68,7 +68,9 @@ static void handler(int sig, siginfo_t *
+ }
+ 
+ void set_signal_handler() {
+-  static char altstack[SIGSTKSZ];
++  static char *altstack=(char*)NULL;
++
++  if(!altstack) altstack=(char*)malloc(SIGSTKSZ);
+ 
+   stack_t ss = {
+     .ss_size = SIGSTKSZ,
diff --git a/remove-intree-libraries.sh b/remove-intree-libraries.sh
deleted file mode 100755
index bdfc48d..0000000
--- a/remove-intree-libraries.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-ZLIB_SRC=src/java.base/share/native/libzip/zlib/
-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/
-FREETYPE_SRC=src/java.desktop/share/native/libfreetype/
-HARFBUZZ_SRC=src/java.desktop/share/native/libfontmanager/harfbuzz/
-
-cd openjdk
-
-echo "Removing built-in libs (they will be linked)"
-
-echo "Removing zlib"
-if [ ! -d ${ZLIB_SRC} ]; then
-	echo "${ZLIB_SRC} does not exist. Refusing to proceed."
-	exit 1
-fi	
-rm -rvf ${ZLIB_SRC}
-
-echo "Removing libjpeg"
-if [ ! -f ${JPEG_SRC}/jdhuff.c ]; then # some file that sound 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
-
-echo "Removing freetype"
-if [ ! -d ${FREETYPE_SRC} ]; then
-	echo "${FREETYPE_SRC} does not exist. Refusing to proceed."
-	exit 1
-fi
-rm -rvf ${FREETYPE_SRC}
-
-echo "Removing harfbuzz"
-if [ ! -d ${HARFBUZZ_SRC} ]; then
-	echo "${HARFBUZZ_SRC} does not exist. Refusing to proceed."
-	exit 1
-fi
-rm -rvf ${HARFBUZZ_SRC}
diff --git a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
index 849197b..5ae3b00 100644
--- a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+++ b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
@@ -9,10 +9,3 @@ diff -up openjdk/src/java.base/share/conf/security/java.security.1~ openjdk/src/
  
  #
  # A list of preferred providers for specific algorithms. These providers will
-@@ -1319,4 +1320,4 @@ jdk.io.permissionsUseCanonicalPath=false
- # properties. In the case that both properties are simultaneously set, the
- # System value prevails. The default value of the property is "false".
- #
--#jdk.security.allowNonCaAnchor=true
-\ No newline at end of file
-+#jdk.security.allowNonCaAnchor=true