feat(patchable)!: Use consistent long index in patches

CHANGELOG.md

@@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file.
 - vector: Add the wrapper script `/stackable/bin/vector-with-env-var-interpolation` which enables
   the interpolation of environment variables in the Vector configuration files ([#1693]).
 - opa: Add 1.20.2 ([#1697]).
+- patchable: Use long hashes, and myers diff algorithm for portability ([#1705]).
 
 ### Changed
 
@@ -151,6 +152,7 @@ All notable changes to this project will be documented in this file.
 [#1693]: https://github.com/stackabletech/docker-images/pull/1693
 [#1697]: https://github.com/stackabletech/docker-images/pull/1697
 [#1704]: https://github.com/stackabletech/docker-images/pull/1704
+[#1705]: https://github.com/stackabletech/docker-images/pull/1705
 
 ## [26.7.0] - 2026-07-21
 

airflow/stackable/patches/3.2.2/0001-Allow-overriding-the-logging-configuration.patch

@@ -8,7 +8,7 @@ Subject: Allow overriding the logging configuration
  1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/shared/logging/src/airflow_shared/logging/structlog.py b/shared/logging/src/airflow_shared/logging/structlog.py
-index 74cb6dc1966..19ec59ecda8 100644
+index 74cb6dc196634978e775266158428fa6f7da9f91..19ec59ecda82cc3ddac5c852d88d491c46ef233b 100644
 --- a/shared/logging/src/airflow_shared/logging/structlog.py
 +++ b/shared/logging/src/airflow_shared/logging/structlog.py
 @@ -489,6 +489,18 @@ def structlog_processors(

airflow/stackable/patches/3.3.1/0001-Allow-overriding-the-logging-configuration.patch

@@ -8,7 +8,7 @@ Subject: Allow overriding the logging configuration
  1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/shared/logging/src/airflow_shared/logging/structlog.py b/shared/logging/src/airflow_shared/logging/structlog.py
-index b13be19144..117e6f655b 100644
+index b13be19144567978e6f0fb2ae35d9474a941028c..117e6f655b394e7b27c01bb8ce1e0e11b995d0e8 100644
 --- a/shared/logging/src/airflow_shared/logging/structlog.py
 +++ b/shared/logging/src/airflow_shared/logging/structlog.py
 @@ -532,6 +532,18 @@ def structlog_processors(

druid/stackable/patches/37.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch

@@ -9,7 +9,7 @@ Subject: Removes all traces of the druid ranger extension
  2 files changed, 3 deletions(-)
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index a1b2da00d3..51ce7563ea 100644
+index a1b2da00d3c1d165e870c9cc2b761289a4a1f8bc..51ce7563ea1d3960339789886effa4a68f46492b 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
 @@ -448,8 +448,6 @@
@@ -22,7 +22,7 @@ index a1b2da00d3..51ce7563ea 100644
                                      </arguments>
                                  </configuration>
 diff --git a/pom.xml b/pom.xml
-index 614ab31c09..6548d3a661 100644
+index 614ab31c09142fcf38b3578e229df378d4923389..6548d3a6610d6ac1b60c8b99b220b95dab1597fc 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -266,7 +266,6 @@

druid/stackable/patches/37.0.0/0002-Include-Prometheus-emitter-in-distribution.patch

@@ -8,7 +8,7 @@ Subject: Include Prometheus emitter in distribution
  1 file changed, 45 insertions(+)
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index 51ce7563ea..28dc3f6a5f 100644
+index 51ce7563ea1d3960339789886effa4a68f46492b..28dc3f6a5f0a72d23c2a8cfb08dfb150e34918e0 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
 @@ -457,5 +457,50 @@

druid/stackable/patches/37.0.0/0003-Stop-building-unused-extensions.patch

@@ -11,7 +11,7 @@ extensions from the build.
  1 file changed, 29 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 6548d3a661..d252009bc4 100644
+index 6548d3a6610d6ac1b60c8b99b220b95dab1597fc..d252009bc4c5c636f03279e7bc623c25a2256cc4 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -235,37 +235,8 @@

druid/stackable/patches/37.0.0/0004-Include-jackson-dataformat-xml-dependency.patch

@@ -12,7 +12,7 @@ build.
  1 file changed, 5 insertions(+)
 
 diff --git a/server/pom.xml b/server/pom.xml
-index 06f26c6da6..79e0dafe5f 100644
+index 06f26c6da6ce20f54cd76e82853a7036d6d6838f..79e0dafe5fbaf6a2e58ec1ab12295c0cbd8d45e1 100644
 --- a/server/pom.xml
 +++ b/server/pom.xml
 @@ -212,6 +212,11 @@

druid/stackable/patches/37.0.0/0005-Stop-building-the-tar.gz-distribution.patch

@@ -10,7 +10,7 @@ again. So, instead we just skip the compression step entirely.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/distribution/src/assembly/assembly.xml b/distribution/src/assembly/assembly.xml
-index 2b510ea85d..0fe10032ca 100644
+index 2b510ea85dd9ed3c82828d84840e84045b5fdc40..0fe10032cad5b4078f7248db1c2671467324d020 100644
 --- a/distribution/src/assembly/assembly.xml
 +++ b/distribution/src/assembly/assembly.xml
 @@ -23,7 +23,7 @@

druid/stackable/patches/37.0.0/0006-Update-CycloneDX-plugin.patch

@@ -8,7 +8,7 @@ Subject: Update CycloneDX plugin
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
-index d252009bc4..a4a8f0e1e8 100644
+index d252009bc4c5c636f03279e7bc623c25a2256cc4..a4a8f0e1e87189d3d0c7c8cdbe905cf153d094ca 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1969,7 +1969,7 @@

druid/stackable/patches/37.0.0/0007-Update-FMPP-version.patch

@@ -12,7 +12,7 @@ which we don't want.
  1 file changed, 7 insertions(+)
 
 diff --git a/sql/pom.xml b/sql/pom.xml
-index d62a265bbf..b8c07203bb 100644
+index d62a265bbf0854cf874004e57d0e87c6d16c8d36..b8c07203bb4059f3bf4b544db090bf9e46f5c3ca 100644
 --- a/sql/pom.xml
 +++ b/sql/pom.xml
 @@ -382,6 +382,13 @@

druid/stackable/patches/37.0.0/0008-Stop-building-the-embedded-integration-tests.patch

@@ -8,7 +8,7 @@ Subject: Stop building the embedded integration tests
  1 file changed, 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
-index a4a8f0e1e8..73ce663463 100644
+index a4a8f0e1e87189d3d0c7c8cdbe905cf153d094ca..73ce663463c7af3cf54fca31743e091fe1837636 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -241,7 +241,6 @@

druid/stackable/patches/37.0.0/0009-feat-add-configurable-clientAuthenticationMethod-to-.patch

@@ -11,7 +11,7 @@ Subject: feat: add configurable clientAuthenticationMethod to druid-pac4j OIDC
  3 files changed, 45 insertions(+), 1 deletion(-)
 
 diff --git a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java
-index 50b04455db..d83e04717a 100644
+index 50b04455dbc59a0a9505736fba8ebd3c81879066..d83e04717a0f6bcc05be3f2c2caf874cd301ddc6 100644
 --- a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java
 +++ b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java
 @@ -44,13 +44,17 @@ public class OIDCConfig
@@ -53,7 +53,7 @@ index 50b04455db..d83e04717a 100644
 +  }
  }
 diff --git a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java
-index ef30f4c7e6..59a6fa0782 100644
+index ef30f4c7e69d7918203d1bdd9a89563da29ae321..59a6fa0782f5f98537d51f836baa952d27b6f937 100644
 --- a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java
 +++ b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/Pac4jAuthenticator.java
 @@ -27,6 +27,7 @@ import com.google.common.base.Supplier;
@@ -76,7 +76,7 @@ index ef30f4c7e6..59a6fa0782 100644
      oidcConf.setUseNonce(true);
      oidcConf.setReadTimeout(Ints.checkedCast(pac4jCommonConfig.getReadTimeout().getMillis()));
 diff --git a/extensions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java b/extensions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java
-index c4192c020d..0b6128e61b 100644
+index c4192c020dfa9c60dacd809e36e2e4269e54c0ea..0b6128e61bb45335742f9b022421bd855d05566e 100644
 --- a/extensions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java
 +++ b/extensions-core/druid-pac4j/src/test/java/org/apache/druid/security/pac4j/OIDCConfigTest.java
 @@ -46,6 +46,7 @@ public class OIDCConfigTest

druid/stackable/patches/37.0.0/0010-Update-dependencies.patch

@@ -10,7 +10,7 @@ Subject: Update dependencies
  3 files changed, 17 insertions(+), 12 deletions(-)
 
 diff --git a/extensions-core/druid-pac4j/pom.xml b/extensions-core/druid-pac4j/pom.xml
-index 76cd236ebf..f7512d3c4f 100644
+index 76cd236ebfc6b2b4b97890ff5f15fedf785e04af..f7512d3c4f0cf0b0d0f8ef736583c7c7fff50f08 100644
 --- a/extensions-core/druid-pac4j/pom.xml
 +++ b/extensions-core/druid-pac4j/pom.xml
 @@ -34,11 +34,12 @@
@@ -29,7 +29,7 @@ index 76cd236ebf..f7512d3c4f 100644
    </properties>
 
 diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml
-index 5e16ebb8ae..21f833e080 100644
+index 5e16ebb8ae1eb186c01302c12e5362c97810eb22..21f833e08089962ab56556c8e52a857e0c6d5f7d 100644
 --- a/extensions-core/orc-extensions/pom.xml
 +++ b/extensions-core/orc-extensions/pom.xml
 @@ -31,7 +31,7 @@
@@ -42,7 +42,7 @@ index 5e16ebb8ae..21f833e080 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 73ce663463..8e5dd97e38 100644
+index 73ce663463c7af3cf54fca31743e091fe1837636..8e5dd97e38944076f0dd5bfcd968fa659dcacb28 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -73,7 +73,7 @@

hadoop/hadoop/stackable/patches/3.3.6/0001-YARN-11527-Update-node.js.patch

@@ -8,7 +8,7 @@ Subject: YARN-11527: Update node.js
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index f1ac43ed5b..9b01858e0e 100644
+index f1ac43ed5b38aeffe7b7d1f9c25ec42f2f7c7752..9b01858e0e195452f0f1754fd5b6b45e564b00ba 100644
 --- a/hadoop-project/pom.xml
 +++ b/hadoop-project/pom.xml
 @@ -213,7 +213,7 @@

hadoop/hadoop/stackable/patches/3.3.6/0002-Allow-overriding-datanode-registration-addresses.patch

@@ -11,7 +11,7 @@ Subject: Allow overriding datanode registration addresses
  4 files changed, 135 insertions(+), 22 deletions(-)
 
 diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
-index e3f4bfcde8..3d65bcad22 100755
+index e3f4bfcde8408d0ed63abcca059bf2ca1e7848f1..3d65bcad22905e494131c87abded38768b2dc446 100755
 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 @@ -147,6 +147,13 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
@@ -38,7 +38,7 @@ index e3f4bfcde8..3d65bcad22 100755
    public static final boolean DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_DEFAULT = true;
 
 diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
-index 07381fc696..8aeb92cff1 100644
+index 07381fc696fae549e2014b804ab34e409b0a571b..8aeb92cff11f6f94d8493727ec3266d1aa24d890 100644
 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
 +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
 @@ -180,6 +180,8 @@ public class DatanodeManager {
@@ -110,7 +110,7 @@ index 07381fc696..8aeb92cff1 100644
        // it will be disallowed from registering. 
        if (!hostConfigManager.isIncluded(nodeReg)) {
 diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java
-index 9b5343321d..790d508e5e 100644
+index 9b5343321d30bc06ed82161ea1b57a4ebac220cf..790d508e5ea54b516383f95967d3d3890eda2b87 100644
 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java
 +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java
 @@ -100,6 +100,11 @@ public class DNConf {
@@ -205,7 +205,7 @@ index 9b5343321d..790d508e5e 100644
     * Returns socket timeout
     * 
 diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
-index 96c4ad9ae2..66b75cff3f 100644
+index 96c4ad9ae28d864fd6a294227c6d60b98ed12ea3..66b75cff3fc2a40c63d4585bcfdf154b79b88e2c 100644
 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 @@ -117,6 +117,7 @@ import java.util.HashSet;

hadoop/hadoop/stackable/patches/3.3.6/0003-HADOOP-18055-Add-async-profiler.patch

@@ -24,7 +24,7 @@ Subject: HADOOP-18055: Add async-profiler
  create mode 100644 hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java
 
 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
-index 8dadbe390a..1f66a7e809 100644
+index 8dadbe390a56cb57965ea47d0a47e716f9e80884..1f66a7e809c822e54a0ccf85ca8a1ea3823aaafe 100644
 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
 +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
 @@ -27,6 +27,7 @@ import java.net.InetSocketAddress;
@@ -64,7 +64,7 @@ index 8dadbe390a..1f66a7e809 100644
    private void addPrometheusServlet(Configuration conf) {
 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java
 new file mode 100644
-index 0000000000..1ecc21f375
+index 0000000000000000000000000000000000000000..1ecc21f3753ceb42596e05119e717fc6fc654388
 --- /dev/null
 +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileOutputServlet.java
 @@ -0,0 +1,87 @@
@@ -157,7 +157,7 @@ index 0000000000..1ecc21f375
 +}
 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java
 new file mode 100644
-index 0000000000..fc0ec7736e
+index 0000000000000000000000000000000000000000..fc0ec7736ed8e40c46c6ad18a82d0c097313e9d8
 --- /dev/null
 +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfileServlet.java
 @@ -0,0 +1,394 @@
@@ -557,7 +557,7 @@ index 0000000000..fc0ec7736e
 +}
 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java
 new file mode 100644
-index 0000000000..459485ffa5
+index 0000000000000000000000000000000000000000..459485ffa5b56ff6fe8b20a0f39748154f6ec8c7
 --- /dev/null
 +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java
 @@ -0,0 +1,44 @@
@@ -607,7 +607,7 @@ index 0000000000..459485ffa5
 +}
 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java
 new file mode 100644
-index 0000000000..cf653b9c91
+index 0000000000000000000000000000000000000000..cf653b9c912c48e0e1f34086dd62aa77d40bc293
 --- /dev/null
 +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ProcessUtils.java
 @@ -0,0 +1,74 @@
@@ -686,7 +686,7 @@ index 0000000000..cf653b9c91
 +  }
 +}
 diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
-index b1a25ce1f0..8068bae969 100644
+index b1a25ce1f0081cab11a3310dfa976aa1aec92297..8068bae969186971e35bc94c7bb1d56d69572668 100644
 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
 +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
 @@ -69,7 +69,7 @@
@@ -700,7 +700,7 @@ index b1a25ce1f0..8068bae969 100644
 
 diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md b/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md
 new file mode 100644
-index 0000000000..4b93cc219a
+index 0000000000000000000000000000000000000000..4b93cc219a5eea52f9cf32e83ec9ecb0b1ddbf3d
 --- /dev/null
 +++ b/hadoop-common-project/hadoop-common/src/site/markdown/AsyncProfilerServlet.md
 @@ -0,0 +1,145 @@
@@ -851,7 +851,7 @@ index 0000000000..4b93cc219a
 +
 diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java
 new file mode 100644
-index 0000000000..ce068bb6f1
+index 0000000000000000000000000000000000000000..ce068bb6f1cf6730b3babadf1706abbdc439a9a4
 --- /dev/null
 +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestDisabledProfileServlet.java
 @@ -0,0 +1,95 @@
@@ -951,7 +951,7 @@ index 0000000000..ce068bb6f1
 +
 +}
 diff --git a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
-index 6ea21d5cf4..09375d5aab 100644
+index 6ea21d5cf407d6c47244e57972aacbd9ab73d147..09375d5aab528e80916b20efc5c7ec5b78021bb8 100644
 --- a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
 +++ b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
 @@ -1208,9 +1208,10 @@ Name               | Description
@@ -976,7 +976,7 @@ index 6ea21d5cf4..09375d5aab 100644
    </property>
 
 diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
-index 2d0a5b8cd2..e97de0275c 100644
+index 2d0a5b8cd2e7d0dcdb6814893427dd959377d0f2..e97de0275ca22f6ca8e002a0549858d233c16532 100644
 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
 +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
 @@ -162,9 +162,10 @@ Name               | Description
@@ -1001,7 +1001,7 @@ index 2d0a5b8cd2..e97de0275c 100644
    </property>
 
 diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
-index b53cbd2a05..0793e97771 100644
+index b53cbd2a05657c9f9365e09ace25ea1d8bdc1d33..0793e977712854ee535d3c8babdc36f1718eecad 100644
 --- a/hadoop-project/src/site/site.xml
 +++ b/hadoop-project/src/site/site.xml
 @@ -74,6 +74,7 @@

hadoop/hadoop/stackable/patches/3.3.6/0004-Backport-HADOOP-18077.patch

@@ -9,7 +9,7 @@ Subject: Backport HADOOP-18077
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
-index 1f66a7e809..96794086cb 100644
+index 1f66a7e809c822e54a0ccf85ca8a1ea3823aaafe..96794086cb87d4e75ef001c8c54caa9da3c70520 100644
 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
 +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
 @@ -745,10 +745,11 @@ public final class HttpServer2 implements FilterContainer {
@@ -35,7 +35,7 @@ index 1f66a7e809..96794086cb 100644
        addServlet("prof", "/prof", ProfilerDisabledServlet.class);
        LOG.info("ASYNC_PROFILER_HOME environment variable and async.profiler.home system property "
 diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java
-index 459485ffa5..c488b57499 100644
+index 459485ffa5b56ff6fe8b20a0f39748154f6ec8c7..c488b574990ccb2db33e960999556dbd809d450b 100644
 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java
 +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/ProfilerDisabledServlet.java
 @@ -36,9 +36,15 @@ public class ProfilerDisabledServlet extends HttpServlet {