squid 6.10: Back to standard

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>

diff --git a/lfs/squid b/lfs/squid
index 60774594cc0566658024c22e519cd5cb2203208f..d7fefe8c804fd343a94ec770daa11c47a0160adf 100644 (file)
--- 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 (file)
index 17f0b6a..0000000
--- 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);