1
0
mirror of https://github.com/termux/termux-packages synced 2024-06-13 20:46:45 +00:00
termux-packages/packages/squid/fix-hardcoded-paths.patch
2022-11-15 04:07:19 +00:00

33 lines
1.3 KiB
Diff

diff -uNr squid-4.8/src/dns_internal.cc squid-4.8.mod/src/dns_internal.cc
--- squid-4.8/src/dns_internal.cc 2019-07-09 22:05:20.000000000 +0300
+++ squid-4.8.mod/src/dns_internal.cc 2019-09-23 15:39:36.373673900 +0300
@@ -52,7 +52,7 @@
#define REG_VXD_MSTCP "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP"
#endif
#ifndef _PATH_RESCONF
-#define _PATH_RESCONF "/etc/resolv.conf"
+#define _PATH_RESCONF "@TERMUX_PREFIX@/etc/resolv.conf"
#endif
#ifndef NS_DEFAULTPORT
#define NS_DEFAULTPORT 53
@@ -1610,7 +1610,7 @@
#if _SQUID_WINDOWS_
debugs(78, DBG_IMPORTANT, "Please check your TCP-IP settings or /etc/resolv.conf file");
#else
- debugs(78, DBG_IMPORTANT, "Please check your /etc/resolv.conf file");
+ debugs(78, DBG_IMPORTANT, "Please check your @TERMUX_PREFIX@/etc/resolv.conf file");
#endif
debugs(78, DBG_IMPORTANT, "or use the 'dns_nameservers' option in squid.conf.");
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -117,7 +117,7 @@
const mode_t prev_umask=umask(S_IXUSR|S_IXGRP|S_IWGRP|S_IWOTH|S_IXOTH);
#if HAVE_MKSTEMP
- char filename[] = "/tmp/squid-XXXXXX";
+ char filename[] = "@TERMUX_PREFIX@/tmp/squid-XXXXXX";
int tfd = mkstemp(filename);
if (tfd < 0 || (fp = fdopen(tfd, "w")) == NULL) {
umask(prev_umask);