From 901e3e697947262761c671e8c9318febed976a30 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Wed, 24 Jul 2024 00:07:59 +0200 Subject: [PATCH] squid 6.10: Back to standard Signed-off-by: Matthias Fischer --- lfs/squid | 1 - src/patches/squid/patch_to_2024-03-07.patch | 26 --------------------- 2 files changed, 27 deletions(-) delete mode 100644 src/patches/squid/patch_to_2024-03-07.patch diff --git a/lfs/squid b/lfs/squid index 60774594c..d7fefe8c8 100644 --- a/lfs/squid +++ b/lfs/squid @@ -78,7 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid/patch_to_2024-03-07.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid/patch_to_2024-03-07.patch b/src/patches/squid/patch_to_2024-03-07.patch deleted file mode 100644 index 17f0b6a23..000000000 --- a/src/patches/squid/patch_to_2024-03-07.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/auth/basic/NIS/nis_support.h Mon Mar 4 06:45:51 2024 -+++ src/auth/basic/NIS/nis_support.h Thu Mar 7 08:51:06 2024 -@@ -8,9 +8,6 @@ - #ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H - #define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H - --#ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H --#define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H -- - extern char * get_nis_password(char *user, char *nisdomain, char *nismap); - - #endif /* SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H */ ---- src/comm/TcpAcceptor.cc Mon Mar 4 06:45:51 2024 -+++ src/comm/TcpAcceptor.cc Thu Mar 7 08:51:06 2024 -@@ -381,7 +381,10 @@ - if (getsockname(sock, gai->ai_addr, &gai->ai_addrlen) != 0) { - int xerrno = errno; - Ip::Address::FreeAddr(gai); -- throw TextException(ToSBuf("getsockname() failed to locate local-IP on ", details, ": ", xstrerr(xerrno)), Here()); -+ debugs(50, DBG_IMPORTANT, "ERROR: Closing accepted TCP connection after failing to obtain its local IP address" << -+ Debug::Extra << "accepted connection: " << details << -+ Debug::Extra << "getsockname(2) error: " << xstrerr(xerrno)); -+ return false; - } - details->local = *gai; - Ip::Address::FreeAddr(gai); -- 2.39.5