Use @TERMUX_PREFIX@ in more patch files

diff --git a/packages/alpine/configure.patch b/packages/alpine/configure.patch
index 7de72a775140c79f06763260a089fd5465e76ca1..dcbae5995f52480bbcf7a1fa605974765f4bdd5f 100644 (file)
--- a/packages/alpine/configure.patch
+++ b/packages/alpine/configure.patch
@@ -6,11 +6,11 @@ diff -u -r ../alpine-2.21/configure ./configure
      fi
      ;;
 +  *-*-*-android*)
      fi
      ;;
 +  *-*-*-android*)

-+    alpine_SSLDIR="/data/data/com.termux/files/usr/etc/tls"
++    alpine_SSLDIR="@TERMUX_PREFIX@/etc/tls"

 +    alpine_SSLCERTS="$alpine_SSLDIR/certs"
 +    alpine_SSLKEYS="$alpine_SSLDIR/private"
 +    alpine_SSLCERTS="$alpine_SSLDIR/certs"
 +    alpine_SSLKEYS="$alpine_SSLDIR/private"

-+    alpine_SSLINCLUDE="/data/data/com.termux/files/usr/include/openssl"
-+    alpine_SSLLIB="/data/data/com.termux/files/usr/lib"
++    alpine_SSLINCLUDE="@TERMUX_PREFIX@/include/openssl"
++    alpine_SSLLIB="@TERMUX_PREFIX@/lib"

 +    alpine_path_delim="/"
 +       ;;
    *-apple-darwin*)
 +    alpine_path_delim="/"
 +       ;;
    *-apple-darwin*)

diff --git a/packages/ncmpcpp/config.patch b/packages/ncmpcpp/config.patch
index 89426d3c65720b28c98d8f214833df0da9749d85..800f3fab836eb02d9f2c0637d94688c8e179afe4 100644 (file)
--- a/packages/ncmpcpp/config.patch
+++ b/packages/ncmpcpp/config.patch
@@ -5,7 +5,7 @@
  ##
  #
 -#visualizer_fifo_path = /tmp/mpd.fifo
  ##
  #
 -#visualizer_fifo_path = /tmp/mpd.fifo

-+visualizer_fifo_path = "/data/data/com.termux/files/usr/tmp/mpd.fifo"
++visualizer_fifo_path = "@TERMUX_PREFIX@/tmp/mpd.fifo"

 +visualizer_output_name = "my_fifo"
 +visualizer_sync_interval = "30"
 +visualizer_in_stereo = "yes"
 +visualizer_output_name = "my_fifo"
 +visualizer_sync_interval = "30"
 +visualizer_in_stereo = "yes"

diff --git a/packages/screen/screen.h.patch b/packages/screen/screen.h.patch
index 1a861554fa9f92cad5f9d0fe83d0f8f9c92ebc6c..52b1bc2ce71affde2dab65f18b299e9a8b384976 100644 (file)
--- a/packages/screen/screen.h.patch
+++ b/packages/screen/screen.h.patch
@@ -5,10 +5,10 @@
  #define DEFAULTHISTHEIGHT     100
  #if defined(NAME_MAX) && NAME_MAX < 16
 -# define DEFAULT_BUFFERFILE     "/tmp/screen-xchg"
  #define DEFAULTHISTHEIGHT     100
  #if defined(NAME_MAX) && NAME_MAX < 16
 -# define DEFAULT_BUFFERFILE     "/tmp/screen-xchg"

-+# define DEFAULT_BUFFERFILE     "/data/data/com.termux/files/usr/tmp/screen-xchg"
++# define DEFAULT_BUFFERFILE     "@TERMUX_PREFIX@/tmp/screen-xchg"

  #else
 -# define DEFAULT_BUFFERFILE   "/tmp/screen-exchange"
  #else
 -# define DEFAULT_BUFFERFILE   "/tmp/screen-exchange"

-+# define DEFAULT_BUFFERFILE   "/data/data/com.termux/files/usr/tmp/screen-exchange"
++# define DEFAULT_BUFFERFILE   "@TERMUX_PREFIX@/tmp/screen-exchange"

  #endif
  
  
  #endif
  
  

diff --git a/packages/tor/fix-hardcoded-paths.patch b/packages/tor/fix-hardcoded-paths.patch
index 333e01e3504e12bbc7bf7e8c27395fba3406f877..b7393cc88786af4e2fc38bafba471b99c7e1bdf1 100644 (file)
--- a/packages/tor/fix-hardcoded-paths.patch
+++ b/packages/tor/fix-hardcoded-paths.patch
@@ -6,7 +6,7 @@ diff -uNr tor-0.3.1.8/src/or/dns.c tor-0.3.1.8.mod/src/or/dns.c
  #ifndef _WIN32
    if (!conf_fname)
 -    conf_fname = "/etc/resolv.conf";
  #ifndef _WIN32
    if (!conf_fname)
 -    conf_fname = "/etc/resolv.conf";

-+    conf_fname = "/data/data/com.termux/files/usr/etc/resolv.conf";
++    conf_fname = "@TERMUX_PREFIX@/etc/resolv.conf";

  #endif
    flags = DNS_OPTIONS_ALL;
  
  #endif
    flags = DNS_OPTIONS_ALL;
  


@@ -18,7 +18,7 @@ diff -uNr tor-0.3.1.8/src/or/main.c tor-0.3.1.8.mod/src/or/main.c
    OPEN("/dev/urandom");
    OPEN("/dev/random");
 -  OPEN("/etc/hosts");
    OPEN("/dev/urandom");
    OPEN("/dev/random");
 -  OPEN("/etc/hosts");

-+  OPEN("/data/data/com.termux/files/usr/etc/hosts");
++  OPEN("@TERMUX_PREFIX@/etc/hosts");

    OPEN("/proc/meminfo");
  
    if (options->BridgeAuthoritativeDir)
    OPEN("/proc/meminfo");
  
    if (options->BridgeAuthoritativeDir)


@@ -27,7 +27,7 @@ diff -uNr tor-0.3.1.8/src/or/main.c tor-0.3.1.8.mod/src/or/main.c
                                  tor_strdup(options->ServerDNSResolvConfFile));
    else
 -    sandbox_cfg_allow_open_filename(&cfg, tor_strdup("/etc/resolv.conf"));
                                  tor_strdup(options->ServerDNSResolvConfFile));
    else
 -    sandbox_cfg_allow_open_filename(&cfg, tor_strdup("/etc/resolv.conf"));

-+    sandbox_cfg_allow_open_filename(&cfg, tor_strdup("/data/data/com.termux/files/usr/etc/resolv.conf"));
++    sandbox_cfg_allow_open_filename(&cfg, tor_strdup("@TERMUX_PREFIX@/etc/resolv.conf"));

  
    for (i = 0; i < 2; ++i) {
      if (get_torrc_fname(i)) {
  
    for (i = 0; i < 2; ++i) {
      if (get_torrc_fname(i)) {


@@ -36,7 +36,7 @@ diff -uNr tor-0.3.1.8/src/or/main.c tor-0.3.1.8.mod/src/or/main.c
      OPEN_DATADIR_SUFFIX("router-stability", ".tmp");
  
 -    OPEN("/etc/resolv.conf");
      OPEN_DATADIR_SUFFIX("router-stability", ".tmp");
  
 -    OPEN("/etc/resolv.conf");

-+    OPEN("/data/data/com.termux/files/usr/etc/resolv.conf");
++    OPEN("@TERMUX_PREFIX@/etc/resolv.conf");

  
      RENAME_SUFFIX("fingerprint", ".tmp");
      RENAME_SUFFIX2("keys", "secret_onion_key_ntor", ".tmp");
  
      RENAME_SUFFIX("fingerprint", ".tmp");
      RENAME_SUFFIX2("keys", "secret_onion_key_ntor", ".tmp");