From 646f4aacc6a30339fffc2323f98159223e62ecec Mon Sep 17 00:00:00 2001
From: carterscottm <carterscottm@gmail.com>
Date: Fri, 26 Oct 2018 17:00:20 -0400
Subject: [PATCH] removed need to 'sudo setcap' on DT executable

---
 pack/df_linux/distro_fixes.sh         |   3 +++
 pack/df_linux/libs/set_ptracer_any.c  |  12 ++++++++++++
 pack/df_linux/libs/set_ptracer_any.so | Bin 0 -> 16048 bytes
 pack/startlnp                         |  15 ---------------
 4 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 pack/df_linux/libs/set_ptracer_any.c
 create mode 100755 pack/df_linux/libs/set_ptracer_any.so

diff --git a/pack/df_linux/distro_fixes.sh b/pack/df_linux/distro_fixes.sh
index c7dd0d9..274298d 100755
--- a/pack/df_linux/distro_fixes.sh
+++ b/pack/df_linux/distro_fixes.sh
@@ -170,6 +170,9 @@ if [ -n "$ZLIB_PATH" ]; then
     dlog INFO "Attempting to use zlib at $ZLIB_PATH"
 fi
 
+# Include set_ptracer_any.so in PRELOAD_LIB to remove the necessity to run setcap on the Dwarf Therapist executable
+export PRELOAD_LIB="${PRELOAD_LIB:+$PRELOAD_LIB:}./libs/set_ptracer_any.so"
+
 dlog "INFO" "PRELOAD_LIB: $PRELOAD_LIB"
 dlog "INFO" "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
 dlog "INFO" "Done"
diff --git a/pack/df_linux/libs/set_ptracer_any.c b/pack/df_linux/libs/set_ptracer_any.c
new file mode 100644
index 0000000..99fd7db
--- /dev/null
+++ b/pack/df_linux/libs/set_ptracer_any.c
@@ -0,0 +1,12 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/prctl.h>
+
+void set_ptracer_any() __attribute__((constructor));
+
+void set_ptracer_any()
+{
+	if (-1 == prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY, 0, 0, 0))
+		perror("prctl");
+}
diff --git a/pack/df_linux/libs/set_ptracer_any.so b/pack/df_linux/libs/set_ptracer_any.so
new file mode 100755
index 0000000000000000000000000000000000000000..f507378f53fb9285445d6470d5609284142ad841
GIT binary patch
literal 16048
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

literal 0
HcmV?d00001

diff --git a/pack/startlnp b/pack/startlnp
index 56b14f2..f2afc1b 100755
--- a/pack/startlnp
+++ b/pack/startlnp
@@ -26,20 +26,5 @@ if [ ! -d df_linux ]; then
     echo "working directory: $(pwd)"
 fi
 
-gcap="$(whereis -b getcap | cut -f2 -d":" | tr -d " ")"
-scap="$(whereis -b setcap | cut -f2 -d":" | tr -d " ")"
-
-if [ -x $gcap ] && [ -x $scap ]; then
-    #Check whether Dwarf Therapist can read from DF memory:
-    dt_capabilities=$($gcap LNP/utilities/dwarf_therapist/dwarftherapist |cut -f2 -d"="|tr -d " ")
-    dt_capabilities=${dt_capabilities:=0}
-    if [ ${dt_capabilities} != "cap_sys_ptrace+eip" ]; then
-        msg="Enable Dwarf Therapist to read from Dwarf Fortress memory"
-        xterm -e "echo $msg;sudo $scap cap_sys_ptrace=eip LNP/utilities/dwarf_therapist/dwarftherapist"
-    fi
-else
-    warn "Could not find getcap and/or setcap"
-fi
-
 #run Lazy Newb Pack
 ./PyLNP "$@" || warn "Failed to start PyLNP"