diff --git a/harfbuzz-libs.patch b/harfbuzz-libs.patch
deleted file mode 100644
index 182e10e..0000000
--- a/harfbuzz-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
-index 4d0c0c00dbf..ef7eadae206 100644
---- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
-+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
-@@ -435,7 +435,7 @@ endif
-
- ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
- LIBFONTMANAGER_EXTRA_SRC =
-- BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS)
-+ BUILD_LIBFONTMANAGER_FONTLIB += $(HARFBUZZ_LIBS)
- else
- LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
-
diff --git a/icedtea-sound-1.0.1-jdk9.patch b/icedtea-sound-1.0.1-jdk9.patch
deleted file mode 100644
index 250fb64..0000000
--- a/icedtea-sound-1.0.1-jdk9.patch
+++ /dev/null
@@ -1,355 +0,0 @@
---- icedtea-sound-1.0.1/Makefile.am Fri Jul 18 23:46:15 2014 +0100
-+++ icedtea-sound-1.0.1/Makefile.am Thu Nov 02 13:16:38 2017 +0100
-@@ -28,7 +28,6 @@
- ICEDTEA_SOUND_JAVA_GENDIR = $(abs_top_builddir)/src/java
-
- # Build directories
--RUNTIME = $(SYSTEM_JDK_DIR)/jre/lib/rt.jar
- ICEDTEA_SOUND_BUILDDIR = $(abs_top_builddir)/build
- ICEDTEA_SOUND_NATIVE_BUILDDIR = $(ICEDTEA_SOUND_BUILDDIR)/native
- ICEDTEA_SOUND_NATIVE_OBJECTS = \
-@@ -38,6 +37,7 @@
- # Files
- # Must use relative paths so as not to break make distcheck
- ICEDTEA_SOUND_JAVA_SRCS = $(top_srcdir)/src/java/org/classpath/icedtea/*/*.java \
-+ $(top_srcdir)/src/java/module-info.java \
- $(top_builddir)/src/java/org/classpath/icedtea/Config.java
- ICEDTEA_SOUND_SRCS = $(ICEDTEA_SOUND_JAVA_SRCS) \
- $(top_srcdir)/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider \
-@@ -51,10 +51,15 @@
- EXTRA_DIST = $(ICEDTEA_SOUND_SRCS)
-
- # Flags
--IT_LANGUAGE_SOURCE_VERSION=6
--IT_CLASS_TARGET_VERSION=6
-+IT_LANGUAGE_SOURCE_VERSION=10
-+IT_CLASS_TARGET_VERSION=10
- IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
- IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
-+if ENABLE_WARNINGS
-+IT_JAVACFLAGS+=-Xlint
-+else
-+IT_JAVACFLAGS+=-nowarn
-+endif
- IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
- LDFLAGS+=-Xlinker -z -Xlinker defs
- if ENABLE_DOCS
-@@ -62,7 +67,7 @@
- JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \
- -bottom ' Submit a bug or feature'
- if JAVADOC_SUPPORTS_J_OPTIONS
--JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m
-+JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m
- endif
- endif
-
-@@ -80,8 +85,7 @@
- install-exec-local: $(ICEDTEA_SOUND_NATIVE_BUILDDIR)/$(TARGET_NAME)
- ${mkinstalldirs} $(DESTDIR)$(libdir)
- ${INSTALL_PROGRAM} $(ICEDTEA_SOUND_NATIVE_BUILDDIR)/$(TARGET_NAME) \
-- $(DESTDIR)$(libdir)/$(LIBRARY_NAME)
-- ln -sf $(LIBRARY_NAME) $(DESTDIR)$(libdir)/$(TARGET_NAME)
-+ $(DESTDIR)$(libdir)/
-
- install-data-local: stamps/icedtea-sound-jar.stamp stamps/docs.stamp
- ${mkinstalldirs} $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/
-@@ -112,9 +116,8 @@
- touch $@
-
- stamps/icedtea-sound-class.stamp:
-- mkdir -p $(ICEDTEA_SOUND_CLASS_DIR)
-- $(abs_top_builddir)/javac $(IT_JAVACFLAGS) -d $(ICEDTEA_SOUND_CLASS_DIR) \
-- -bootclasspath $(RUNTIME) $(ICEDTEA_SOUND_JAVA_SRCS)
-+ mkdir -p $(ICEDTEA_SOUND_CLASS_DIR) $(ICEDTEA_SOUND_NATIVE_BUILDDIR)
-+ $(JAVAC) $(IT_JAVACFLAGS) -h $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -d $(ICEDTEA_SOUND_CLASS_DIR) $(ICEDTEA_SOUND_JAVA_SRCS)
- cp -r $(ICEDTEA_SOUND_JAVA_SRCDIR)/META-INF $(ICEDTEA_SOUND_CLASS_DIR)
- chmod -R ug+w $(ICEDTEA_SOUND_CLASS_DIR)/META-INF
- mkdir -p stamps
-@@ -125,24 +128,7 @@
- mkdir -p stamps
- touch $@
-
--stamps/icedtea-sound-headers.stamp: stamps/icedtea-sound-class.stamp
-- mkdir -p $(ICEDTEA_SOUND_NATIVE_BUILDDIR)
-- $(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-- -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
-- $(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-- -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
-- $(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-- -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
-- $(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-- -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
-- $(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-- -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
-- $(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
-- -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent
-- mkdir -p stamps
-- touch $@
--
--$(ICEDTEA_SOUND_NATIVE_BUILDDIR)/%.o: $(ICEDTEA_SOUND_NATIVE_SRCDIR)/%.c stamps/icedtea-sound-headers.stamp
-+$(ICEDTEA_SOUND_NATIVE_BUILDDIR)/%.o: $(ICEDTEA_SOUND_NATIVE_SRCDIR)/%.c stamps/icedtea-sound-class.stamp
- $(CC) $(IT_CFLAGS) -fPIC -I$(SYSTEM_JDK_DIR)/include/linux -I$(SYSTEM_JDK_DIR)/include \
- -I$(ICEDTEA_SOUND_NATIVE_BUILDDIR) -o $@ -c $<
-
---- icedtea-sound-1.0.1/acinclude.m4 Fri Jul 18 23:46:15 2014 +0100
-+++ icedtea-sound-1.0.1/acinclude.m4 Thu Nov 02 13:16:38 2017 +0100
-@@ -129,63 +129,16 @@
- AC_DEFUN([IT_FIND_COMPILER],
- [
- AC_REQUIRE([IT_FIND_JAVA])
-- AC_REQUIRE([IT_FIND_ECJ_JAR])
-
- IT_FIND_JAVAC
-- IT_FIND_ECJ
-- IT_USING_ECJ
-
-- if test "x${ECJ_JAR}" = "xno"; then
-- if test "x${JAVAC}" = "x"; then
-- AC_MSG_ERROR("No compiler or ecj JAR file was found.")
-- fi
-+ if test "x${JAVAC}" = "x"; then
-+ AC_MSG_ERROR("No compiler found.")
- fi
-
-- AC_SUBST(ECJ)
- AC_SUBST(JAVAC)
- ])
-
--AC_DEFUN_ONCE([IT_FIND_ECJ],
--[
-- ECJ_DEFAULT=/usr/bin/ecj
-- AC_MSG_CHECKING([if an ecj binary was specified])
-- AC_ARG_WITH([ecj],
-- [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
-- [
-- if test "x${withval}" = "xyes"; then
-- ECJ=no
-- else
-- ECJ="${withval}"
-- fi
-- ],
-- [
-- ECJ=no
-- ])
-- AC_MSG_RESULT(${ECJ})
-- if test "x${ECJ}" = "xno"; then
-- ECJ=${ECJ_DEFAULT}
-- fi
-- AC_MSG_CHECKING([if $ECJ is a valid executable file])
-- if test -x "${ECJ}" && test -f "${ECJ}"; then
-- AC_MSG_RESULT([yes])
-- else
-- ECJ=""
-- AC_PATH_PROG(ECJ, "ecj")
-- if test -z "${ECJ}"; then
-- AC_PATH_PROG(ECJ, "ecj-3.1")
-- fi
-- if test -z "${ECJ}"; then
-- AC_PATH_PROG(ECJ, "ecj-3.2")
-- fi
-- if test -z "${ECJ}"; then
-- AC_PATH_PROG(ECJ, "ecj-3.3")
-- fi
-- if test -z "${ECJ}"; then
-- AC_PATH_PROG(ECJ, "ecj-3.4")
-- fi
-- fi
--])
--
- AC_DEFUN_ONCE([IT_FIND_JAVAC],
- [
- AC_REQUIRE([IT_CHECK_FOR_JDK])
-@@ -260,74 +213,6 @@
- AC_SUBST(JAVA)
- ])
-
--AC_DEFUN_ONCE([IT_FIND_ECJ_JAR],
--[
-- AC_MSG_CHECKING([for an ecj JAR file])
-- AC_ARG_WITH([ecj-jar],
-- [AS_HELP_STRING([--with-ecj-jar[[=PATH]]],specify location of an ECJ JAR file)],
-- [
-- if test -f "${withval}"; then
-- ECJ_JAR="${withval}"
-- fi
-- ],
-- [
-- ECJ_JAR=
-- ])
-- if test -z "${ECJ_JAR}"; then
-- for jar in /usr/share/java/eclipse-ecj.jar \
-- /usr/share/java/ecj.jar \
-- /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar; do
-- if test -e $jar; then
-- ECJ_JAR=$jar
-- break
-- fi
-- done
-- if test -z "${ECJ_JAR}"; then
-- ECJ_JAR=no
-- fi
-- fi
-- AC_MSG_RESULT(${ECJ_JAR})
-- AC_SUBST(ECJ_JAR)
--])
--
--AC_DEFUN_ONCE([IT_FIND_JAVAH],
--[
-- AC_REQUIRE([IT_CHECK_FOR_JDK])
-- JAVAH_DEFAULT=${SYSTEM_JDK_DIR}/bin/javah
-- AC_MSG_CHECKING([if a javah executable is specified])
-- AC_ARG_WITH([javah],
-- [AS_HELP_STRING([--with-javah[[=PATH]]],specify location of javah)],
-- [
-- if test "x${withval}" = "xyes"; then
-- JAVAH=no
-- else
-- JAVAH="${withval}"
-- fi
-- ],
-- [
-- JAVAH=no
-- ])
-- AC_MSG_RESULT(${JAVAH})
-- if test "x${JAVAH}" == "xno"; then
-- JAVAH=${JAVAH_DEFAULT}
-- fi
-- AC_MSG_CHECKING([if $JAVAH is a valid executable file])
-- if test -x "${JAVAH}" && test -f "${JAVAH}"; then
-- AC_MSG_RESULT([yes])
-- else
-- AC_MSG_RESULT([no])
-- JAVAH=""
-- AC_PATH_PROG(JAVAH, "javah")
-- if test -z "${JAVAH}"; then
-- AC_PATH_PROG(JAVAH, "gjavah")
-- fi
-- if test -z "${JAVAH}"; then
-- AC_MSG_ERROR("A Java header generator was not found.")
-- fi
-- fi
-- AC_SUBST(JAVAH)
--])
--
- AC_DEFUN_ONCE([IT_FIND_JAR],
- [
- AC_REQUIRE([IT_CHECK_FOR_JDK])
-@@ -457,7 +342,7 @@
- [
- AC_MSG_CHECKING([for a JDK home directory])
- AC_ARG_WITH([jdk-home],
-- [AS_HELP_STRING([--with-jdk-home[[=PATH]]],
-+ [AS_HELP_STRING([--with-jdk-home[[=PATH]]],
- [jdk home directory (default is first predefined JDK found)])],
- [
- if test "x${withval}" = xyes
-@@ -474,50 +359,28 @@
- SYSTEM_JDK_DIR=
- ])
- if test -z "${SYSTEM_JDK_DIR}"; then
-- AC_MSG_RESULT([not specified])
-- if test "x${enable_bootstrap}" = "xyes"; then
-- BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
-- fi
-- ICEDTEA6_VMS="/usr/lib/jvm/icedtea-6 /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk
-- /usr/lib/jvm/java-1.6.0-openjdk.x86_64 /usr/lib64/jvm/java-1.6.0-openjdk
-- /usr/lib/jvm/java-1.6.0"
-- ICEDTEA7_VMS="/usr/lib/jvm/icedtea-7 /usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk
-- /usr/lib/jvm/java-1.7.0-openjdk.x86_64 /usr/lib64/jvm/java-1.7.0-openjdk
-- /usr/lib/jvm/java-1.7.0 /usr/lib/jvm/java-7-openjdk"
-- for dir in ${BOOTSTRAP_VMS} ${ICEDTEA7_VMS} ${ICEDTEA6_VMS} \
-- /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea \
-- /etc/alternatives/java_sdk_openjdk ; do
-- AC_MSG_CHECKING([for ${dir}]);
-+ for dir in /etc/alternatives/java_sdk \
-+ /usr/lib/jvm/java-1.9.0-openjdk \
-+ /usr/lib64/jvm/java-1.9.0-openjdk \
-+ /usr/lib/jvm/icedtea9 \
-+ /usr/lib64/jvm/icedtea9 \
-+ /usr/lib/jvm/java-10-openjdk \
-+ /usr/lib64/jvm/java-10-openjdk ; do
- if test -d $dir; then
-- SYSTEM_JDK_DIR=$dir ;
-- AC_MSG_RESULT([found]) ;
-- break ;
-- else
-- AC_MSG_RESULT([not found]) ;
-+ SYSTEM_JDK_DIR=$dir
-+ break
- fi
- done
-- else
-- AC_MSG_RESULT(${SYSTEM_JDK_DIR})
- fi
- if ! test -d "${SYSTEM_JDK_DIR}"; then
-- AC_MSG_ERROR("A JDK home directory could not be found.")
-+ AC_MSG_ERROR("A JDK home directory could not be found. ${SYSTEM_JDK_DIR}")
-+ else
-+ READ=`readlink -f ${SYSTEM_JDK_DIR}`
-+ AC_MSG_RESULT(${SYSTEM_JDK_DIR} (link to ${READ}))
- fi
- AC_SUBST(SYSTEM_JDK_DIR)
- ])
-
--AC_DEFUN([IT_USING_ECJ],[
--AC_CACHE_CHECK([if we are using ecj as javac], it_cv_ecj, [
--if $JAVAC -version 2>&1| grep '^Eclipse' >&AS_MESSAGE_LOG_FD ; then
-- it_cv_ecj=yes;
--else
-- it_cv_ecj=no;
--fi
--])
--USING_ECJ=$it_cv_ecj
--AC_SUBST(USING_ECJ)
--AC_PROVIDE([$0])dnl
--])
--
- dnl check that javac and java work
- AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
- AC_REQUIRE([IT_FIND_JAVA])
-@@ -538,7 +401,7 @@
- }
- }]
- EOF
-- if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-+ if $JAVAC -cp . $JAVACFLAGS -source 10 -target 10 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
- if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
- it_cv_jdk_works=yes;
- else
-@@ -560,7 +423,7 @@
- [
- AC_MSG_CHECKING(whether to enable Java compiler warnings)
- AC_ARG_ENABLE([warnings],
-- [AS_HELP_STRING(--enable-warnings,produce warnings from javac/ecj [[default=no]])],
-+ [AS_HELP_STRING(--enable-warnings,produce warnings from javac [[default=no]])],
- [
- ENABLE_WARNINGS="${enableval}"
- ],
-@@ -570,5 +433,4 @@
-
- AC_MSG_RESULT(${ENABLE_WARNINGS})
- AM_CONDITIONAL(ENABLE_WARNINGS, test x"${ENABLE_WARNINGS}" = "xyes")
-- AC_SUBST(ENABLE_WARNINGS)
- ])
---- icedtea-sound-1.0.1/configure.ac Fri Jul 18 23:46:15 2014 +0100
-+++ icedtea-sound-1.0.1/configure.ac Thu Nov 02 13:16:38 2017 +0100
-@@ -43,10 +43,8 @@
- IT_FIND_TOOL([ZIP], [zip])
-
- IT_CHECK_JAVA_AND_JAVAC_WORK
--IT_FIND_JAVAH
- IT_FIND_JAR
- IT_FIND_JAVADOC
--AC_CONFIG_FILES([javac], [chmod +x javac])
-
- IT_CHECK_ENABLE_WARNINGS
-
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ icedtea-sound-1.0.1/src/java/module-info.java Thu Nov 02 13:16:38 2017 +0100
-@@ -0,0 +1,6 @@
-+module icedtea.sound {
-+ exports org.classpath.icedtea.pulseaudio;
-+ requires java.desktop;
-+ provides javax.sound.sampled.spi.MixerProvider
-+ with org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider;
-+}
diff --git a/icedtea-sound-1.0.1.tar.xz b/icedtea-sound-1.0.1.tar.xz
deleted file mode 100644
index 8854fbc..0000000
--- a/icedtea-sound-1.0.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3
-size 1515308
diff --git a/icedtea-sound-soundproperties.patch b/icedtea-sound-soundproperties.patch
deleted file mode 100644
index 6a089e6..0000000
--- a/icedtea-sound-soundproperties.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- jdk10/src/java.desktop/share/conf/sound.properties 2008-08-28 04:15:18.000000000 -0400
-+++ jdk10/src/java.desktop/share/conf/sound.properties 2008-10-03 16:59:21.000000000 -0400
-@@ -37,3 +37,13 @@
- # Specify the default Receiver by provider and name:
- # javax.sound.midi.Receiver=com.sun.media.sound.MidiProvider#SunMIDI1
- #
-+
-+# javax.sound.sampled.Clip=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
-+# javax.sound.sampled.Port=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
-+# javax.sound.sampled.SourceDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
-+# javax.sound.sampled.TargetDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
-+
-+javax.sound.sampled.Clip=com.sun.media.sound.DirectAudioDeviceProvider
-+javax.sound.sampled.Port=com.sun.media.sound.PortMixerProvider
-+javax.sound.sampled.SourceDataLine=com.sun.media.sound.DirectAudioDeviceProvider
-+javax.sound.sampled.TargetDataLine=com.sun.media.sound.DirectAudioDeviceProvider
diff --git a/java-17-openjdk.changes b/java-17-openjdk.changes
index 59d3791..91d6261 100644
--- a/java-17-openjdk.changes
+++ b/java-17-openjdk.changes
@@ -1,3 +1,142 @@
+-------------------------------------------------------------------
+Fri Oct 22 05:58:29 UTC 2021 - Fridrich Strba
+
+- Update to upstream tag jdk-17.0.1+12 (October 2021 CPU)
+ * Security fixes
+ + JDK-8263314: Enhance XML Dsig modes
+ + JDK-8265167, CVE-2021-35556, bsc#1191910: Richer Text Editors
+ + JDK-8265574: Improve handling of sheets
+ + JDK-8265580, CVE-2021-35559, bsc#1191911: Enhanced style for
+ RTF kit
+ + JDK-8265776: Improve Stream handling for SSL
+ + JDK-8266097, CVE-2021-35561, bsc#1191912: Better hashing
+ support
+ + JDK-8266103: Better specified spec values
+ + JDK-8266109: More Resilient Classloading
+ + JDK-8266115: More Manifest Jar Loading
+ + JDK-8266137, CVE-2021-35564, bsc#1191913: Improve Keystore
+ integrity
+ + JDK-8266689, CVE-2021-35567, bsc#1191903: More Constrained
+ Delegation
+ + JDK-8267086: ArrayIndexOutOfBoundsException in
+ java.security.KeyFactory.generatePublic
+ + JDK-8267712: Better LDAP reference processing
+ + JDK-8267729, CVE-2021-35578, bsc#1191904: Improve TLS client
+ handshaking
+ + JDK-8267735, CVE-2021-35586, bsc#1191914: Better BMP support
+ + JDK-8268199: Correct certificate requests
+ + JDK-8268205: Enhance DTLS client handshake
+ + JDK-8268506: More Manifest Digests
+ + JDK-8269618, CVE-2021-35603, bsc#1191906: Better session
+ identification
+ + JDK-8269624: Enhance method selection support
+ + JDK-8270398: Enhance canonicalization
+ + JDK-8270404: Better canonicalization
+ * Other changes:
+ + JDK-8225082: Remove IdenTrust certificate that is expiring in
+ September 2021
+ + JDK-8225083: Remove Google certificate that is expiring in
+ December 2021
+ + JDK-8243543: jtreg test security/infra/java/security/cert/
+ /CertPathValidator/certification/BuypassCA.java fails
+ + JDK-8248899: security/infra/java/security/cert/
+ /CertPathValidator/certification/QuoVadisCA.java fails,
+ Certificate has been revoked
+ + JDK-8261088: Repeatable annotations without @Target cannot
+ have containers that target module declarations
+ + JDK-8262731: [macOS] Exception from "Printable.print" is
+ swallowed during "PrinterJob.print"
+ + JDK-8263531: Remove unused buffer int
+ + JDK-8266182: Automate manual steps listed in the test
+ jdk/sun/security/pkcs12/ParamsTest.java
+ + JDK-8267625: AARCH64: typo in LIR_Assembler::emit_profile_type
+ + JDK-8267666: Add option to jcmd GC.heap_dump to use existing
+ file
+ + JDK-8268019: C2: assert(no_dead_loop) failed: dead loop
+ detected
+ + JDK-8268261: C2: assert(n != __null) failed: Bad immediate
+ dominator info.
+ + JDK-8268427: Improve AlgorithmConstraints:checkAlgorithm
+ performance
+ + JDK-8268500: Better specified ParameterSpecs
+ + JDK-8268963: [IR Framework] Some default regexes matching on
+ PrintOptoAssembly in IRNode.java do not work on all platforms
+ + JDK-8269297: Bump version numbers for JDK 17.0.1
+ + JDK-8269478: Shenandoah: gc/shenandoah/mxbeans tests should
+ be more resilient
+ + JDK-8269574: C2: Avoid redundant uncommon traps in
+ GraphKit::builtin_throw() for JVMTI exception events
+ + JDK-8269763: The JEditorPane is blank after JDK-8265167
+ + JDK-8269851: OperatingSystemMXBean getProcessCpuLoad reports
+ incorrect process cpu usage in containers
+ + JDK-8269882: stack-use-after-scope in NewObjectA
+ + JDK-8269897: Shenandoah: Resolve UNKNOWN access strength,
+ where possible
+ + JDK-8269934: RunThese24H.java failed with
+ EXCEPTION_ACCESS_VIOLATION in
+ java_lang_Thread::get_thread_status
+ + JDK-8269993: [Test]: java/net/httpclient/
+ /DigestEchoClientSSL.java contains redundant @run tags
+ + JDK-8270094: Shenandoah: Provide human-readable labels for
+ test configurations
+ + JDK-8270096: Shenandoah: Optimize
+ gc/shenandoah/TestRefprocSanity.java for interpreter mode
+ + JDK-8270098: ZGC: ZBarrierSetC2::clone_at_expansion fails
+ with "Guard against surprises" assert
+ + JDK-8270137: Kerberos Credential Retrieval from Cache not
+ Working in Cross-Realm Setup
+ + JDK-8270280: security/infra/java/security/cert/
+ /CertPathValidator/certification/LetsEncryptCA.java OCSP
+ response error
+ + JDK-8270344: Session resumption errors
+ + JDK-8271203: C2: assert(iff->Opcode() == Op_If ||
+ iff->Opcode() == Op_CountedLoopEnd || iff->Opcode() ==
+ Op_RangeCheck) failed: Check this code when new subtype is
+ added
+ + JDK-8271276: C2: Wrong JVM state used for receiver null check
+ + JDK-8271335: Updating RE Configs for BUILD REQUEST 17.0.1+4
+ + JDK-8271589: fatal error with variable shift count integer
+ rotate operation.
+ + JDK-8271723: Unproblemlist
+ runtime/InvocationTests/invokevirtualTests.java
+ + JDK-8271730: Client authentication using RSASSA-PSS fails
+ after correct certificate requests
+ + JDK-8271925: ZGC: Arraycopy stub passes invalid oop to load
+ barrier
+ + JDK-8272124: Cgroup v1 initialization causes
+ NullPointerException when cgroup path contains colon
+ + JDK-8272131: PhaseMacroExpand::generate_slow_arraycopy crash
+ when clone null CallProjections.fallthrough_ioproj
+ + JDK-8272326: java/util/Random/RandomTestMoments.java had two
+ Gaussian fails
+ + JDK-8272332: --with-harfbuzz=system doesn't add -lharfbuzz
+ after JDK-8255790
+ + JDK-8272472: StackGuardPages test doesn't build with glibc
+ 2.34
+ + JDK-8272581: sun/security/pkcs11/Provider/MultipleLogins.sh
+ fails after JDK-8266182
+ + JDK-8272602: [macos] not all KEY_PRESSED events sent when
+ control modifier is used
+ + JDK-8272700: [macos] Build failure with Xcode 13.0 after
+ JDK-8264848
+ + JDK-8272708: [Test]: Cleanup: test/jdk/security/infra/java/
+ /security/cert/CertPathValidator/certification/BuypassCA.java
+ no longer needs ocspEnabled
+ + JDK-8272806: [macOS] "Apple AWT Internal Exception" when
+ input method is changed
+ + JDK-8273150: Revert "8225083: Remove Google certificate that
+ is expiring in December 2021"
+ + JDK-8273358: macOS Monterey does not have the font Times
+ needed by Serif
+- Remove the unneeded icedtea-sound provider
+- Removed patches:
+ * icedtea-sound-1.0.1-jdk9.patch
+ * icedtea-sound-soundproperties.patch
+ + not needed since the icedtea-sound provider is removed
+ * harfbuzz-libs.patch
+ * openjdk-glibc234.patch
+ + integrated upstream
+
-------------------------------------------------------------------
Mon Sep 20 06:41:11 UTC 2021 - Fridrich Strba
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index d0d4229..2fae26f 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -32,14 +32,13 @@
# Standard JPackage naming and versioning defines.
%global featurever 17
%global interimver 0
-%global updatever 0
+%global updatever 1
%global patchver 0
-%global datever 2021-09-14
-%global buildver 35
+%global datever 2021-10-19
+%global buildver 12
%global openjdk_repo jdk17u
-%global openjdk_tag jdk-17+35
-%global openjdk_dir jdk17u-jdk-17-35
-%global icedtea_sound_version 1.0.1
+%global openjdk_tag jdk-17.0.1+12
+%global openjdk_dir jdk17u-jdk-17.0.1-12
# JavaEE modules
%global java_atk_wrapper_version 0.33.2
%global java_activation_repository activation
@@ -116,7 +115,6 @@
%global with_system_pcsc 0
%global with_system_lcms 0
%endif
-%global with_pulseaudio 1
%bcond_with zero
%if ! %{with zero}
%global with_systemtap 1
@@ -151,8 +149,6 @@ URL: https://openjdk.java.net/
Source0: https://github.com/openjdk/%{openjdk_repo}/archive/%{openjdk_tag}.tar.gz
# Accessibility support
Source8: https://download.gnome.org/sources/java-atk-wrapper/0.33/java-atk-wrapper-%{java_atk_wrapper_version}.tar.xz
-# Pulseaudio support
-Source9: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
# Systemtap tapsets. Zipped up to keep it small.
Source10: systemtap-tapset.tar.xz
# Desktop files. Adapated from IcedTea.
@@ -188,9 +184,6 @@ Source28: %{jaxb_ri_repository}-%{jaxb_ri_tag}.tar.gz
Source100: config.guess
# wget -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
Source101: config.sub
-# RPM/distribution specific patches
-Patch1: icedtea-sound-1.0.1-jdk9.patch
-Patch2: icedtea-sound-soundproperties.patch
# Restrict access to java-atk-wrapper classes
Patch3: java-atk-wrapper-security.patch
# RHBZ 808293
@@ -205,7 +198,6 @@ Patch10: memory-limits.patch
Patch12: adlc-parser.patch
# Fix: implicit-pointer-decl
Patch13: implicit-pointer-decl.patch
-Patch14: harfbuzz-libs.patch
Patch15: system-pcsclite.patch
Patch16: system-crypto-policy.patch
@@ -214,8 +206,6 @@ Patch18: fips.patch
#
Patch20: loadAssistiveTechnologies.patch
#
-Patch30: openjdk-glibc234.patch
-#
# OpenJDK specific patches
#
Patch200: ppc_stack_overflow_fix.patch
@@ -327,11 +317,6 @@ BuildRequires: libffi-devel
%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel
%endif
-# pulse audio requirements
-%if %{with_pulseaudio}
-BuildRequires: libpulse-devel >= 0.9.11
-BuildRequires: pulseaudio >= 0.9.11
-%endif
%if %{with_system_pcsc}
BuildRequires: pcsc-lite-devel
%endif
@@ -459,7 +444,6 @@ need to.
%prep
%setup -q -n %{openjdk_dir}
%setup -q -D -n %{openjdk_dir} -T -a 8
-%setup -q -D -n %{openjdk_dir} -T -a 9
%setup -q -D -n %{openjdk_dir} -T -a 20
%setup -q -D -n %{openjdk_dir} -T -a 21
%setup -q -D -n %{openjdk_dir} -T -a 22
@@ -484,11 +468,6 @@ rm -rvf src/java.desktop/share/native/liblcms/cms*
rm -rvf src/java.desktop/share/native/liblcms/lcms2*
%endif
-%patch1
-%if %{with_pulseaudio}
-%patch2 -p1
-%endif
-
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -496,7 +475,6 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
%patch10 -p1
%patch12 -p1
%patch13 -p1
-%patch14 -p1
%if %{with_system_pcsc}
%patch15 -p1
@@ -508,8 +486,6 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
%patch20 -p1
-%patch30 -p1
-
%patch200 -p1
%ifarch %{arm6}
@@ -636,24 +612,6 @@ install -m 644 nss.fips.cfg $JAVA_HOME/conf/security/
# Copy tz.properties
echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/conf/tz.properties
-%if %{with_pulseaudio}
-# Build the pulseaudio plugin
-pushd icedtea-sound-%{icedtea_sound_version}
-autoreconf --force --install
-%configure \
- --with-jdk-home=$JAVA_HOME \
- --disable-docs
-make %{?_smp_mflags}
-cp icedtea-sound.jar $JAVA_HOME/../jmods/
-cp build/native/libicedtea-sound.so $JAVA_HOME/lib/
-popd
-# Merge the icedtea-sound into the JDK
-source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "icedtea.sound,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
-cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
-rm -rf $JAVA_HOME/../newjdk
-%endif
-
# Build the accessibility plugin
pushd java-atk-wrapper-%{java_atk_wrapper_version}
autoreconf --force --install
@@ -1153,9 +1111,6 @@ fi
%files
%dir %{_jvmdir}/%{sdkdir}/lib
%{_jvmdir}/%{sdkdir}/lib/libawt_xawt.so
-%if %{with_pulseaudio}
-%{_jvmdir}/%{sdkdir}/lib/libicedtea-sound.so
-%endif
%{_jvmdir}/%{sdkdir}/lib/libjawt.so
%{_jvmdir}/%{sdkdir}/lib/libsplashscreen.so
%dir %{_datadir}/icons/hicolor
@@ -1359,9 +1314,6 @@ fi
%dir %{_jvmdir}/%{sdkdir}/jmods
%{_jvmdir}/%{sdkdir}/release
%{_jvmdir}/%{sdkdir}/jmods/*.jmod
-%if %{with_pulseaudio}
-%{_jvmdir}/%{sdkdir}/jmods/icedtea-sound.jar
-%endif
%{_jvmdir}/%{sdkdir}/jmods/java-atk-wrapper.jar
%files demo -f %{name}-demo.files
diff --git a/jdk-17+35.tar.gz b/jdk-17+35.tar.gz
deleted file mode 100644
index 829ea9c..0000000
--- a/jdk-17+35.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30f18c49c004880ede19498c45e91bbef83fb3419aba7abd583bf03a670ea53b
-size 104583143
diff --git a/jdk-17.0.1+12.tar.gz b/jdk-17.0.1+12.tar.gz
new file mode 100644
index 0000000..7d7de1b
--- /dev/null
+++ b/jdk-17.0.1+12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c076203a6f85ab916b3e54de1992bcbcc5ffe580c52b1ac8d52ca7afb9f02d1
+size 104597561
diff --git a/openjdk-glibc234.patch b/openjdk-glibc234.patch
deleted file mode 100644
index ce7a235..0000000
--- a/openjdk-glibc234.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2021-04-09 11:36:58.000000000 +0200
-+++ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2021-08-26 15:42:52.326232581 +0200
-@@ -67,8 +67,17 @@
- longjmp(context, 1);
- }
-
-+static char* altstack = NULL;
-+
- void set_signal_handler() {
-- static char altstack[SIGSTKSZ];
-+ if (altstack == NULL) {
-+ // Dynamically allocated in case SIGSTKSZ is not constant
-+ altstack = malloc(SIGSTKSZ);
-+ if (altstack == NULL) {
-+ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
-+ exit(7);
-+ }
-+ }
-
- stack_t ss = {
- .ss_size = SIGSTKSZ,