Merge ~vpa1977/ubuntu/+source/openjdk-17:lp2011653-drop-patches into ubuntu/+source/openjdk-17:ubuntu/devel

[Vladimir Petko]

Please do not merge, this merge proposal is a part of a series [1][2][3].

Summary of changes:
  * d/p: drop obsolete patches (LP: #2011653).
    - workaround_expand_exec_shield_cs_limit.diff: obsoleted by
      hotspot-disable-exec-shield-workaround.diff.
    - generated-headers.patch: include is already added by openjdk makefile.

PPA: ppa:vpa1977/openjdk-drop-patches [4]

Testing:
 No functional changes in this MP:
       - workaround_expand_exec_shield_cs_limit.diff is obsoleted by another patch applied later in the series
       - generated-headers.patch/parallel-build-fix.patch provide an include directory. If something relies on files in those directories, compilation will be broken.

  Compilation must succeed [5]. Draft version of the package with some extra unneeded changes built successfully [6].

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-17/+git/openjdk-17/+merge/439093
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-17/+git/openjdk-17/+merge/439105
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-17/+git/openjdk-17/+merge/439104
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-drop-patches
[5] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-drop-patches/+sourcepub/14557191/+listing-archive-extra
[6] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-drop-patches/+sourcepub/14556137/+listing-archive-extra

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 02ee7f6..aa26da9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openjdk-17 (17.0.6+10-1ubuntu2) UNRELEASED; urgency=medium
+
+  * d/p: drop obsolete patches (LP: #2011653).
+    - workaround_expand_exec_shield_cs_limit.diff: obsoleted by
+      hotspot-disable-exec-shield-workaround.diff.
+    - generated-headers.patch: include is already added by openjdk makefile.
+
+ -- Vladimir Petko <[e-mail]>  Thu, 16 Mar 2023 15:04:36 +1300
+
 openjdk-17 (17.0.6+10-1ubuntu1) lunar; urgency=medium
 
   * debian/JB-jre-headless.postinst.in: trigger ca-certificates-java after jre
diff --git a/debian/patches/generated-headers.patch b/debian/patches/generated-headers.patch
deleted file mode 100644
index 9c5a2d3..0000000
--- a/debian/patches/generated-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
-+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
-@@ -290,7 +290,7 @@
-     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
-     OPTIMIZATION := HIGHEST, \
-     CFLAGS := $(CFLAGS_JDKLIB) \
--        $(LCMS_CFLAGS), \
-+        $(LCMS_CFLAGS) -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
-     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
-     EXTRA_HEADER_DIRS := \
-         common/awt/debug \
-@@ -338,7 +338,7 @@
-     NAME := javajpeg, \
-     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
-     OPTIMIZATION := HIGHEST, \
--    CFLAGS := $(CFLAGS_JDKLIB), \
-+    CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
-     HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \
-     DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value array-bounds, \
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
diff --git a/debian/patches/hotspot-disable-exec-shield-workaround.diff b/debian/patches/hotspot-disable-exec-shield-workaround.diff
index 924a182..0891ed9 100644
--- a/debian/patches/hotspot-disable-exec-shield-workaround.diff
+++ b/debian/patches/hotspot-disable-exec-shield-workaround.diff
@@ -4,7 +4,7 @@
   * updates (JDK-8023956).
   */
  void os::workaround_expand_exec_shield_cs_limit() {
--#if defined(IA32) && !defined(ZERO)
+-#if defined(IA32)
 +#if 0
    assert(Linux::initial_thread_stack_bottom() != NULL, "sanity");
    size_t page_size = os::vm_page_size();
diff --git a/debian/patches/series b/debian/patches/series
index bbfe8be..c918e98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ icc_loading_with_symlink.diff
 icedtea-override-redirect-compiz.diff
 libpcsclite-dlopen.diff
 default-jvm-cfg.diff
-workaround_expand_exec_shield_cs_limit.diff
 adlc-parser.diff
 multiple-pkcs11-library-init.diff
 s390x-opt.diff
@@ -17,7 +16,6 @@ zero-x32.diff
 hotspot-disable-exec-shield-workaround.diff
 atk-wrapper-security.diff
 dnd-files.diff
-generated-headers.patch
 m68k-support.diff
 reproducible-properties-timestamp.diff
 # reproducible-javadoc-timestamp.diff
diff --git a/debian/patches/workaround_expand_exec_shield_cs_limit.diff b/debian/patches/workaround_expand_exec_shield_cs_limit.diff
deleted file mode 100644
index bad6c03..0000000
--- a/debian/patches/workaround_expand_exec_shield_cs_limit.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
-+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
-@@ -651,7 +651,7 @@
-  * updates (JDK-8023956).
-  */
- void os::workaround_expand_exec_shield_cs_limit() {
--#if defined(IA32)
-+#if defined(IA32) && !defined(ZERO)
-   assert(Linux::initial_thread_stack_bottom() != NULL, "sanity");
-   size_t page_size = os::vm_page_size();
-