chiark - git - mdw - termux-packages/blob - packages/tor/fix-hardcoded-paths.patch

   1 diff -uNr tor-0.3.1.8/src/or/dns.c tor-0.3.1.8.mod/src/or/dns.c
   2 --- tor-0.3.1.8/src/or/dns.c    2017-06-19 18:56:51.000000000 +0300
   3 +++ tor-0.3.1.8.mod/src/or/dns.c        2017-11-10 18:05:46.220054396 +0200
   4 @@ -1349,7 +1349,7 @@
   5    conf_fname = options->ServerDNSResolvConfFile;
   6  #ifndef _WIN32
   7    if (!conf_fname)
   8 -    conf_fname = "/etc/resolv.conf";
   9 +    conf_fname = "@TERMUX_PREFIX@/etc/resolv.conf";
  10  #endif
  11    flags = DNS_OPTIONS_ALL;
  12
  13 diff -uNr tor-0.3.1.8/src/or/main.c tor-0.3.1.8.mod/src/or/main.c
  14 --- tor-0.3.1.8/src/or/main.c   2017-09-29 01:52:51.000000000 +0300
  15 +++ tor-0.3.1.8.mod/src/or/main.c       2017-11-10 18:02:56.257471811 +0200
  16 @@ -3472,7 +3472,7 @@
  17    OPEN("/dev/srandom");
  18    OPEN("/dev/urandom");
  19    OPEN("/dev/random");
  20 -  OPEN("/etc/hosts");
  21 +  OPEN("@TERMUX_PREFIX@/etc/hosts");
  22    OPEN("/proc/meminfo");
  23
  24    if (options->BridgeAuthoritativeDir)
  25 @@ -3485,7 +3485,7 @@
  26      sandbox_cfg_allow_open_filename(&cfg,
  27                                  tor_strdup(options->ServerDNSResolvConfFile));
  28    else
  29 -    sandbox_cfg_allow_open_filename(&cfg, tor_strdup("/etc/resolv.conf"));
  30 +    sandbox_cfg_allow_open_filename(&cfg, tor_strdup("@TERMUX_PREFIX@/etc/resolv.conf"));
  31
  32    for (i = 0; i < 2; ++i) {
  33      if (get_torrc_fname(i)) {
  34 @@ -3631,7 +3631,7 @@
  35      OPEN_DATADIR_SUFFIX("hashed-fingerprint", ".tmp");
  36      OPEN_DATADIR_SUFFIX("router-stability", ".tmp");
  37
  38 -    OPEN("/etc/resolv.conf");
  39 +    OPEN("@TERMUX_PREFIX@/etc/resolv.conf");
  40
  41      RENAME_SUFFIX("fingerprint", ".tmp");
  42      RENAME_SUFFIX2("keys", "secret_onion_key_ntor", ".tmp");