git: 16bef8b16b7f - main - devel/hadoop2: Drop setsid->ssid patches

[Tobias Kortkamp]

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=16bef8b16b7f0d398196f421aa76336af785d5ff

commit 16bef8b16b7f0d398196f421aa76336af785d5ff
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-06-27 17:44:44 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-06-27 19:34:08 +0000

    devel/hadoop2: Drop setsid->ssid patches
    
    sysutils/ssid provides setsid nowadays so this is not necessary.
---
 ...-src-main-java-org-apache-hadoop-util-Shell.java | 21 ---------------------
 ...-main-java-org-apache-hadoop-mapred-TaskLog.java | 11 -----------
 ...rg-apache-hadoop-mapreduce-util-ProcessTree.java | 20 --------------------
 ...server-nodemanager-DefaultContainerExecutor.java | 11 -----------
 4 files changed, 63 deletions(-)

diff --git a/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-java-org-apache-hadoop-util-Shell.java b/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-java-org-apache-hadoop-util-Shell.java
deleted file mode 100644
index 89a0fa4ded2f..000000000000
--- a/devel/hadoop2/files/patch-hadoop-common-project-hadoop-common-src-main-java-org-apache-hadoop-util-Shell.java
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java.orig	2014-06-21 09:40:07.000000000 +0400
-+++ ./hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java	2015-01-06 01:21:22.000000000 +0300
-@@ -348,15 +348,15 @@ abstract public class Shell {
-     ShellCommandExecutor shexec = null;
-     boolean setsidSupported = true;
-     try {
--      String[] args = {"setsid", "bash", "-c", "echo $$"};
-+      String[] args = {"ssid", "bash", "-c", "echo $$"};
-       shexec = new ShellCommandExecutor(args);
-       shexec.execute();
-     } catch (IOException ioe) {
--      LOG.debug("setsid is not available on this machine. So not using it.");
-+      LOG.debug("ssid is not available on this machine. So not using it.");
-       setsidSupported = false;
-     } finally { // handle the exit code
-       if (LOG.isDebugEnabled()) {
--        LOG.debug("setsid exited with exit code "
-+        LOG.debug("ssid exited with exit code "
-                  + (shexec != null ? shexec.getExitCode() : "(null executor)"));
-       }
-     }
diff --git a/devel/hadoop2/files/patch-hadoop-mapreduce-client-core-src-main-java-org-apache-hadoop-mapred-TaskLog.java b/devel/hadoop2/files/patch-hadoop-mapreduce-client-core-src-main-java-org-apache-hadoop-mapred-TaskLog.java
deleted file mode 100644
index 86928a25ba47..000000000000
--- a/devel/hadoop2/files/patch-hadoop-mapreduce-client-core-src-main-java-org-apache-hadoop-mapred-TaskLog.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java.orig	2015-01-06 01:14:31.000000000 +0300
-+++ ./hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java	2015-01-06 01:14:47.000000000 +0300
-@@ -538,7 +538,7 @@ public class TaskLog {
-       mergedCmd.append("(");
-     } else if(ProcessTree.isSetsidAvailable && useSetsid &&
-         !Shell.WINDOWS) {
--      mergedCmd.append("exec setsid ");
-+      mergedCmd.append("exec ssid ");
-     } else {
-       mergedCmd.append("exec ");
-     }
diff --git a/devel/hadoop2/files/patch-hadoop-mapreduce-client-core-src-main-java-org-apache-hadoop-mapreduce-util-ProcessTree.java b/devel/hadoop2/files/patch-hadoop-mapreduce-client-core-src-main-java-org-apache-hadoop-mapreduce-util-ProcessTree.java
deleted file mode 100644
index 5cea6111db95..000000000000
--- a/devel/hadoop2/files/patch-hadoop-mapreduce-client-core-src-main-java-org-apache-hadoop-mapreduce-util-ProcessTree.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcessTree.java.orig	2015-01-06 01:16:49.000000000 +0300
-+++ ./hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcessTree.java	2015-01-06 01:17:24.000000000 +0300
-@@ -54,14 +54,14 @@ public class ProcessTree {
-     ShellCommandExecutor shexec = null;
-     boolean setsidSupported = true;
-     try {
--      String[] args = {"setsid", "bash", "-c", "echo $$"};
-+      String[] args = {"ssid", "bash", "-c", "echo $$"};
-       shexec = new ShellCommandExecutor(args);
-       shexec.execute();
-     } catch (IOException ioe) {
--      LOG.warn("setsid is not available on this machine. So not using it.");
-+      LOG.warn("ssid is not available on this machine. So not using it.");
-       setsidSupported = false;
-     } finally { // handle the exit code
--      LOG.info("setsid exited with exit code " + shexec.getExitCode());
-+      LOG.info("ssid exited with exit code " + shexec.getExitCode());
-     }
-     return setsidSupported;
-   }
diff --git a/devel/hadoop2/files/patch-src-main-java-org-apache-hadoop-yarn-server-nodemanager-DefaultContainerExecutor.java b/devel/hadoop2/files/patch-src-main-java-org-apache-hadoop-yarn-server-nodemanager-DefaultContainerExecutor.java
deleted file mode 100644
index 75c06a29cb31..000000000000
--- a/devel/hadoop2/files/patch-src-main-java-org-apache-hadoop-yarn-server-nodemanager-DefaultContainerExecutor.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java.orig	2015-02-27 14:36:18.000000000 +0300
-+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java	2015-02-27 14:36:48.000000000 +0300
-@@ -353,7 +353,7 @@ public class DefaultContainerExecutor ex
-         pout.println();
-         pout.println("echo $$ > " + pidFile.toString() + ".tmp");
-         pout.println("/bin/mv -f " + pidFile.toString() + ".tmp " + pidFile);
--        String exec = Shell.isSetsidAvailable? "exec setsid" : "exec";
-+        String exec = Shell.isSetsidAvailable? "exec ssid" : "exec";
-         pout.println(exec + " /bin/bash \"" +
-             launchDst.toUri().getPath().toString() + "\"");
-       } finally {