View | Details | Raw Unified | Return to bug 277672
Collapse All | Expand All

(-)b/www/squid/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1 
PORTNAME=	squid
 1 
PORTNAME=	squid
2 
DISTVERSION=	6.7
 2 
DISTVERSION=	6.8
3 
CATEGORIES=	www
 3 
CATEGORIES=	www
4 
MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v6/ \
 4 
MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v6/ \
5 
		http://www1.il.squid-cache.org/Versions/v6/ \
 5 
		http://www1.il.squid-cache.org/Versions/v6/ \
(-)b/www/squid/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1 
TIMESTAMP = 1708443648
 1 
TIMESTAMP = 1710267260
2 
SHA256 (squid-6.7.tar.xz) = e14daa4eae41925d1ae3f08e64439a6aaa3011bdced686628b8de697d5ab8428
 2 
SHA256 (squid-6.8.tar.xz) = 11cc5650b51809d99483ccfae24744a2e51cd16199f5ff0c917e84fce695870f
3 
SIZE (squid-6.7.tar.xz) = 2427468
 3 
SIZE (squid-6.8.tar.xz) = 2547796
(-)b/www/squid/files/patch-configure (-4 / +4 lines)
Lines 1-6 Link Here
1 
--- configure.orig	2023-02-28 09:24:52 UTC
 1 
--- configure.orig	2024-03-04 05:50:28 UTC
2 
+++ configure
 2 
+++ configure
3 
@@ -44124,7 +44124,10 @@ _ACEOF
 3 
@@ -43985,7 +43985,10 @@ _ACEOF
4
4
5 
 else $as_nop
 5 
 else $as_nop
6
6
Lines 12-18 Link Here
12
12
13 
 fi
 13 
 fi
14
14
15 
@@ -50983,6 +50986,7 @@ fi
 15 
@@ -50834,6 +50837,7 @@ fi
16
16
17 
 ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
 17 
 ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
18 
 #if HAVE_SCHED_H
 18 
 #if HAVE_SCHED_H
Lines 20-26 Link Here
20 
 #include <sched.h>
 20 
 #include <sched.h>
21 
 #endif
 21 
 #endif
22
22
23 
@@ -54169,6 +54173,7 @@ else $as_nop
 23 
@@ -54020,6 +54024,7 @@ else $as_nop
24 
 #       include <sys/ioccom.h>
 24 
 #       include <sys/ioccom.h>
25 
 #       include <netinet/in.h>
 25 
 #       include <netinet/in.h>
26 
 #undef minor_t
 26 
 #undef minor_t
(-)b/www/squid/files/patch-include_squid.h (-3 / +3 lines)
Lines 1-8 Link Here
1 
--- include/squid.h.orig	2023-02-28 09:10:25 UTC
 1 
--- include/squid.h.orig	2024-03-04 05:45:51 UTC
2 
+++ include/squid.h
 2 
+++ include/squid.h
3 
@@ -9,6 +9,7 @@
 3 
@@ -9,6 +9,7 @@
4 
 #ifndef SQUID_CONFIG_H
 4 
 #ifndef SQUID_INCLUDE_SQUID_H
5 
 #define SQUID_CONFIG_H
 5 
 #define SQUID_INCLUDE_SQUID_H
6
6
7 
+#define _WITH_CPU_SET_T
 7 
+#define _WITH_CPU_SET_T
8 
 #include "autoconf.h"       /* For GNU autoconf variables */
 8 
 #include "autoconf.h"       /* For GNU autoconf variables */
(-)b/www/squid/files/patch-src-cf.data.pre (-2 / +2 lines)
Lines 1-6 Link Here
1 
--- src/cf.data.pre.orig	2023-02-28 09:10:25 UTC
 1 
--- src/cf.data.pre.orig	2024-03-04 05:45:51 UTC
2 
+++ src/cf.data.pre
 2 
+++ src/cf.data.pre
3 
@@ -5507,6 +5507,10 @@ DEFAULT: @DEFAULT_PID_FILE@
 3 
@@ -5526,6 +5526,10 @@ DEFAULT: @DEFAULT_PID_FILE@
4 
 LOC: Config.pidFilename
 4 
 LOC: Config.pidFilename
5 
 DOC_START
 5 
 DOC_START
6 
 	A filename to write the process-id to.  To disable, enter "none".
 6 
 	A filename to write the process-id to.  To disable, enter "none".
(-)b/www/squid/files/patch-src_auth_basic_NIS_nis__support.h (+12 lines)
Added Link Here
1 
--- src/auth/basic/NIS/nis_support.h.orig	2024-03-04 05:45:51 UTC
2 
+++ src/auth/basic/NIS/nis_support.h
3 
@@ -8,9 +8,6 @@
4 
 #ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H
5 
 #define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H
6
7 
-#ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H
8 
-#define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H
9 
-
10 
 extern char * get_nis_password(char *user, char *nisdomain, char *nismap);
11
12 
 #endif /* SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H */
(-)a/www/squid/files/patch-src_base_RandomUuid.cc (-10 lines)
Removed Link Here
1 
--- src/base/RandomUuid.cc.orig	2023-02-28 09:10:25 UTC
2 
+++ src/base/RandomUuid.cc
3 
@@ -13,6 +13,7 @@
4 
 #include "base/TextException.h"
5 
 #include "defines.h"
6
7 
+#include <netinet/in.h>
8 
 #include <iostream>
9
10 
 static_assert(sizeof(RandomUuid) == 128/8, "RandomUuid has RFC 4122-prescribed 128-bit size");
(-)b/www/squid/files/patch-src_enums.h (-3 / +3 lines)
Lines 1-8 Link Here
1 
--- src/enums.h.orig	2020-04-19 10:50:48 UTC
 1 
--- src/enums.h.orig	2024-03-04 05:45:51 UTC
2 
+++ src/enums.h
 2 
+++ src/enums.h
3 
@@ -9,6 +9,9 @@
 3 
@@ -9,6 +9,9 @@
4 
 #ifndef SQUID_ENUMS_H
 4 
 #ifndef SQUID_SRC_ENUMS_H
5 
 #define SQUID_ENUMS_H
 5 
 #define SQUID_SRC_ENUMS_H
6
6
7 
+/* Namespace pollution from fcntl.h as of FreeBSD r345982 */
 7 
+/* Namespace pollution from fcntl.h as of FreeBSD r345982 */
8 
+#undef FD_NONE
 8 
+#undef FD_NONE
(-)b/www/squid/files/patch-src_ip_Intercept.cc (-3 / +2 lines)
Lines 1-6 Link Here
1 
--- src/ip/Intercept.cc.orig	2023-02-28 09:10:25 UTC
 1 
--- src/ip/Intercept.cc.orig	2024-03-04 05:45:51 UTC
2 
+++ src/ip/Intercept.cc
 2 
+++ src/ip/Intercept.cc
3 
@@ -217,10 +217,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
 3 
@@ -218,10 +218,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
4 
         newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
 4 
         newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
5 
     }
 5 
     }
6 
 #else /* HAVE_STRUCT_NATLOOKUP_NL_INIPADDR_IN6 */
 6 
 #else /* HAVE_STRUCT_NATLOOKUP_NL_INIPADDR_IN6 */
7 
-

Return to bug 277672