diff options
Diffstat (limited to 'www/squid/files')
| -rw-r--r-- | www/squid/files/patch-configure | 34 | ||||
| -rw-r--r-- | www/squid/files/patch-src_cf.data.pre (renamed from www/squid/files/patch-src-cf.data.pre) | 4 | ||||
| -rw-r--r-- | www/squid/files/squid.in | 17 |
3 files changed, 23 insertions, 32 deletions
diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure index c98cda36c325..0aa171813c01 100644 --- a/www/squid/files/patch-configure +++ b/www/squid/files/patch-configure @@ -1,27 +1,15 @@ ---- configure.orig 2024-10-11 07:24:17 UTC +--- configure.orig 2025-02-01 11:08:28 UTC +++ configure -@@ -29452,7 +29452,7 @@ fi - fi +@@ -43956,7 +43956,7 @@ BUILD_HELPER="NIS" + ## - --if test "x$with_nettle" != "xno"] -+if test "x$with_nettle" != "xno" - then : - - -@@ -44043,7 +44043,10 @@ else $as_nop - - else $as_nop - -- BUILD_HELPER="" -+# XXX: On FreeBSD we have to do this to make NIS work -+# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247 -+# is resolved. -+ BUILD_HELPER="NIS" - - fi - -@@ -50892,6 +50895,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type + BUILD_HELPER="NIS" +- for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h crypt.h ++ for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h rpcsvc/crypt.h + do : + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " +@@ -50825,6 +50825,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" " #if HAVE_SCHED_H @@ -29,7 +17,7 @@ #include <sched.h> #endif -@@ -53860,6 +53864,7 @@ else $as_nop +@@ -53793,6 +53794,7 @@ else $as_nop # include <sys/ioccom.h> # include <netinet/in.h> #undef minor_t diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src_cf.data.pre index bfcdb4b2bc8a..5d2e4ecc1086 100644 --- a/www/squid/files/patch-src-cf.data.pre +++ b/www/squid/files/patch-src_cf.data.pre @@ -1,6 +1,6 @@ ---- src/cf.data.pre.orig 2024-03-04 05:45:51 UTC +--- src/cf.data.pre.orig 2025-01-31 08:52:43 UTC +++ src/cf.data.pre -@@ -5526,6 +5526,10 @@ DEFAULT: @DEFAULT_PID_FILE@ +@@ -5552,6 +5552,10 @@ DOC_START LOC: Config.pidFilename DOC_START A filename to write the process-id to. To disable, enter "none". diff --git a/www/squid/files/squid.in b/www/squid/files/squid.in index e8ea315cc356..b1ba8938bf56 100644 --- a/www/squid/files/squid.in +++ b/www/squid/files/squid.in @@ -60,14 +60,16 @@ rcvar=squid_enable # Make sure that we invoke squid with "-f ${squid_conf}"; define this # variable early so reload_cmd and stop_precmd pick it up: -extra_commands="reload configtest" -reload_cmd=squid_reload +# Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported +#extra_commands="reload configtest" +#reload_cmd=squid_reload start_precmd=squid_prestart start_postcmd=squid_getpid -stop_precmd=squid_prestop -configtest_cmd=squid_configtest -reload_precmd=squid_configtest -restart_precmd=squid_configtest +# Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported +#stop_precmd=squid_prestop +#configtest_cmd=squid_configtest +#reload_precmd=squid_configtest +#restart_precmd=squid_configtest # squid(8) will not start if ${squid_conf} is not present so try # to catch that beforehand via ${required_files} rather than make @@ -128,7 +130,8 @@ squid_prestart() return 0 fi - squid_configtest + # Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported + #squid_configtest } squid_reload() |