mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-10 02:21:15 +02:00
Merge branch 'master' of https://github.com/sadsoldier/ports12
This commit is contained in:
@@ -2,13 +2,13 @@
|
||||
# $Id: Makefile 2316 2009-09-02 08:41:08Z root $
|
||||
#
|
||||
PORTNAME= squid
|
||||
PORTVERSION= 4.9
|
||||
PORTVERSION= 5.4.1
|
||||
CATEGORIES= net
|
||||
MASTER_SITES+= http://www.squid-cache.org/Versions/v4/
|
||||
MASTER_SITES+= http://www2.us.squid-cache.org/Versions/v4/
|
||||
MASTER_SITES+= http://www1.at.squid-cache.org/Versions/v4/
|
||||
MASTER_SITES+= http://www.eu.squid-cache.org/Versions/v4/
|
||||
MASTER_SITES+= http://www1.jp.squid-cache.org/Versions/v4/
|
||||
MASTER_SITES+= http://www.squid-cache.org/Versions/v5/
|
||||
MASTER_SITES+= http://www2.us.squid-cache.org/Versions/v5/
|
||||
MASTER_SITES+= http://www1.at.squid-cache.org/Versions/v5/
|
||||
MASTER_SITES+= http://www.eu.squid-cache.org/Versions/v5/
|
||||
MASTER_SITES+= http://www1.jp.squid-cache.org/Versions/v5/
|
||||
|
||||
|
||||
MAINTAINER= homeunix7@gmail.com
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1579943738
|
||||
SHA256 (squid-4.9.tar.xz) = 1cb1838c6683b0568a3a4050f4ea2fc1eaa5cbba6bdf7d57f7258c7cd7b41fa1
|
||||
SIZE (squid-4.9.tar.xz) = 2444664
|
||||
TIMESTAMP = 1647256106
|
||||
SHA256 (squid-5.4.1.tar.xz) = df4d310a91663ae59c29b0f8183f22623c5e6f731869af793805987ab94ca41c
|
||||
SIZE (squid-5.4.1.tar.xz) = 2561444
|
||||
|
||||
11
net/squid/files/patch-compat_cpu.h
Normal file
11
net/squid/files/patch-compat_cpu.h
Normal file
@@ -0,0 +1,11 @@
|
||||
--- compat/cpu.h.orig 2021-12-07 14:15:52 UTC
|
||||
+++ compat/cpu.h
|
||||
@@ -15,6 +15,8 @@
|
||||
#if HAVE_SCHED_H
|
||||
#include <sched.h>
|
||||
#endif
|
||||
+#undef CPU_COUNT
|
||||
+#undef CPU_AND
|
||||
|
||||
#if !HAVE_CPU_AFFINITY
|
||||
/* failing replacements to minimize the number of if-HAVE_CPU_AFFINITYs */
|
||||
@@ -1,19 +1,10 @@
|
||||
--- configure.orig 2019-02-19 03:04:42 UTC
|
||||
--- configure.orig 2021-12-07 14:11:12 UTC
|
||||
+++ configure
|
||||
@@ -34701,7 +34701,7 @@ done
|
||||
##
|
||||
|
||||
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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
|
||||
@@ -34716,8 +34716,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
||||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
@@ -36683,8 +36683,10 @@ then :
|
||||
#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
-else
|
||||
-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
|
||||
@@ -22,71 +13,19 @@
|
||||
fi
|
||||
|
||||
done
|
||||
@@ -35190,7 +35192,7 @@ done
|
||||
@@ -42604,6 +42606,7 @@ fi
|
||||
|
||||
# unconditionally requires crypt(3), for now
|
||||
if test "x$ac_cv_func_crypt" != "x"; then
|
||||
- for ac_header in unistd.h crypt.h shadow.h
|
||||
+ for ac_header in unistd.h rpcsvc/crypt.h shadow.h
|
||||
do :
|
||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||||
@@ -37582,7 +37584,7 @@ for ac_header in \
|
||||
arpa/nameser.h \
|
||||
assert.h \
|
||||
bstring.h \
|
||||
- crypt.h \
|
||||
+ rpcsvc/crypt.h \
|
||||
ctype.h \
|
||||
direct.h \
|
||||
errno.h \
|
||||
@@ -37790,6 +37792,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"
|
||||
#include <netinet/ip.h>
|
||||
ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
|
||||
#if HAVE_SCHED_H
|
||||
+#define _WITH_CPU_SET_T
|
||||
#include <sched.h>
|
||||
#endif
|
||||
#if HAVE_NETINET_IP_COMPAT_H
|
||||
+#include <net/if.h> /* IFNAMSIZ */
|
||||
#include <netinet/ip_compat.h>
|
||||
#endif
|
||||
#if HAVE_NETINET_IP_FIL_H
|
||||
@@ -41819,6 +41822,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
|
||||
# include <sys/ioccom.h>
|
||||
# include <netinet/in.h>
|
||||
|
||||
+# include <net/if.h> /* IFNAMSIZ */
|
||||
# include <netinet/ip_compat.h>
|
||||
# include <netinet/ip_fil.h>
|
||||
# include <netinet/ip_nat.h>
|
||||
@@ -41849,6 +41853,7 @@ else
|
||||
@@ -45611,6 +45614,7 @@ else $as_nop
|
||||
# include <sys/ioccom.h>
|
||||
# include <netinet/in.h>
|
||||
#undef minor_t
|
||||
+# include <net/if.h> /* IFNAMSIZ */
|
||||
+# include <net/if.h> /* IFNAMSIZ */
|
||||
# include <netinet/ip_compat.h>
|
||||
# include <netinet/ip_fil.h>
|
||||
# include <netinet/ip_nat.h>
|
||||
@@ -41893,6 +41898,7 @@ _ACEOF
|
||||
ip_fil_compat.h \
|
||||
ip_fil.h \
|
||||
ip_nat.h \
|
||||
+ net/if.h \
|
||||
netinet/ip_compat.h \
|
||||
netinet/ip_fil_compat.h \
|
||||
netinet/ip_fil.h \
|
||||
@@ -41922,6 +41928,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header"
|
||||
#if HAVE_IP_COMPAT_H
|
||||
#include <ip_compat.h>
|
||||
#elif HAVE_NETINET_IP_COMPAT_H
|
||||
+#include <net/if.h> /* IFNAMSIZ */
|
||||
#include <netinet/ip_compat.h>
|
||||
#endif
|
||||
#if HAVE_IP_FIL_H
|
||||
@@ -41985,8 +41992,7 @@ _ACEOF
|
||||
|
||||
|
||||
fi
|
||||
-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6"
|
||||
- "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
|
||||
+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
|
||||
#if USE_SOLARIS_IPFILTER_MINOR_T_HACK
|
||||
#define minor_t fubar
|
||||
#endif
|
||||
|
||||
10
net/squid/files/patch-include_squid.h
Normal file
10
net/squid/files/patch-include_squid.h
Normal file
@@ -0,0 +1,10 @@
|
||||
--- include/squid.h.orig 2021-12-07 14:15:52 UTC
|
||||
+++ include/squid.h
|
||||
@@ -9,6 +9,7 @@
|
||||
#ifndef SQUID_CONFIG_H
|
||||
#define SQUID_CONFIG_H
|
||||
|
||||
+#define _WITH_CPU_SET_T
|
||||
#include "autoconf.h" /* For GNU autoconf variables */
|
||||
|
||||
#if !defined(HAVE_SQUID)
|
||||
@@ -1,6 +1,6 @@
|
||||
--- src/cf.data.pre.orig 2018-06-11 16:30:57 UTC
|
||||
--- src/cf.data.pre.orig 2021-12-07 14:15:52 UTC
|
||||
+++ src/cf.data.pre
|
||||
@@ -4947,6 +4947,10 @@ DEFAULT: @DEFAULT_PID_FILE@
|
||||
@@ -5354,6 +5354,10 @@ DEFAULT: @DEFAULT_PID_FILE@
|
||||
LOC: Config.pidFilename
|
||||
DOC_START
|
||||
A filename to write the process-id to. To disable, enter "none".
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
--- src/enums.h.orig 2019-02-18 18:46:22.000000000 -0800
|
||||
+++ src/enums.h 2019-04-17 22:22:05.123445000 -0700
|
||||
--- src/enums.h.orig 2020-04-19 10:50:48 UTC
|
||||
+++ src/enums.h
|
||||
@@ -9,6 +9,9 @@
|
||||
#ifndef SQUID_ENUMS_H
|
||||
#define SQUID_ENUMS_H
|
||||
@@ -8,5 +8,5 @@
|
||||
+#undef FD_NONE
|
||||
+
|
||||
enum fd_type {
|
||||
FD_NONE,
|
||||
FD_NONE_TYPE,
|
||||
FD_LOG,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- src/ip/Intercept.cc.orig 2018-07-02 03:26:07 UTC
|
||||
--- src/ip/Intercept.cc.orig 2021-12-07 14:15:52 UTC
|
||||
+++ src/ip/Intercept.cc
|
||||
@@ -215,10 +215,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
|
||||
@@ -211,10 +211,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
|
||||
newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
|
||||
}
|
||||
#else
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- src/security/ServerOptions.h.orig 2019-02-19 02:46:22 UTC
|
||||
+++ src/security/ServerOptions.h
|
||||
@@ -35,7 +35,7 @@ class ServerOptions : public PeerOptions (public)
|
||||
// is more secure to have only a small set of trusted CA.
|
||||
flags.tlsDefaultCa.defaultTo(false);
|
||||
}
|
||||
- ServerOptions(const ServerOptions &) = default;
|
||||
+ ServerOptions(const ServerOptions &) = delete;
|
||||
ServerOptions &operator =(const ServerOptions &);
|
||||
ServerOptions(ServerOptions &&o) { this->operator =(o); }
|
||||
ServerOptions &operator =(ServerOptions &&o) { this->operator =(o); return *this; }
|
||||
@@ -1,6 +1,6 @@
|
||||
--- src/tools.cc.orig 2018-06-11 16:30:57 UTC
|
||||
--- src/tools.cc.orig 2021-12-07 14:15:52 UTC
|
||||
+++ src/tools.cc
|
||||
@@ -605,7 +605,7 @@ no_suid(void)
|
||||
@@ -608,7 +608,7 @@ no_suid(void)
|
||||
uid = geteuid();
|
||||
debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");
|
||||
|
||||
|
||||
@@ -511,15 +511,59 @@ share/squid/errors/en/ERR_ZERO_SIZE_OBJECT
|
||||
share/squid/errors/en/error-details.txt
|
||||
share/squid/errors/es-ar
|
||||
share/squid/errors/es-bo
|
||||
share/squid/errors/es-bz
|
||||
share/squid/errors/es-cl
|
||||
share/squid/errors/es-co
|
||||
share/squid/errors/es-cr
|
||||
share/squid/errors/es-cu
|
||||
share/squid/errors/es-do
|
||||
share/squid/errors/es-ec
|
||||
share/squid/errors/es-es
|
||||
share/squid/errors/es-gt
|
||||
share/squid/errors/es-hn
|
||||
share/squid/errors/es-mx
|
||||
share/squid/errors/es-mx/ERR_ACCESS_DENIED
|
||||
share/squid/errors/es-mx/ERR_ACL_TIME_QUOTA_EXCEEDED
|
||||
share/squid/errors/es-mx/ERR_AGENT_CONFIGURE
|
||||
share/squid/errors/es-mx/ERR_AGENT_WPAD
|
||||
share/squid/errors/es-mx/ERR_CACHE_ACCESS_DENIED
|
||||
share/squid/errors/es-mx/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
share/squid/errors/es-mx/ERR_CANNOT_FORWARD
|
||||
share/squid/errors/es-mx/ERR_CONFLICT_HOST
|
||||
share/squid/errors/es-mx/ERR_CONNECT_FAIL
|
||||
share/squid/errors/es-mx/ERR_DIR_LISTING
|
||||
share/squid/errors/es-mx/ERR_DNS_FAIL
|
||||
share/squid/errors/es-mx/ERR_ESI
|
||||
share/squid/errors/es-mx/ERR_FORWARDING_DENIED
|
||||
share/squid/errors/es-mx/ERR_FTP_DISABLED
|
||||
share/squid/errors/es-mx/ERR_FTP_FAILURE
|
||||
share/squid/errors/es-mx/ERR_FTP_FORBIDDEN
|
||||
share/squid/errors/es-mx/ERR_FTP_NOT_FOUND
|
||||
share/squid/errors/es-mx/ERR_FTP_PUT_CREATED
|
||||
share/squid/errors/es-mx/ERR_FTP_PUT_ERROR
|
||||
share/squid/errors/es-mx/ERR_FTP_PUT_MODIFIED
|
||||
share/squid/errors/es-mx/ERR_FTP_UNAVAILABLE
|
||||
share/squid/errors/es-mx/ERR_GATEWAY_FAILURE
|
||||
share/squid/errors/es-mx/ERR_ICAP_FAILURE
|
||||
share/squid/errors/es-mx/ERR_INVALID_REQ
|
||||
share/squid/errors/es-mx/ERR_INVALID_RESP
|
||||
share/squid/errors/es-mx/ERR_INVALID_URL
|
||||
share/squid/errors/es-mx/ERR_LIFETIME_EXP
|
||||
share/squid/errors/es-mx/ERR_NO_RELAY
|
||||
share/squid/errors/es-mx/ERR_ONLY_IF_CACHED_MISS
|
||||
share/squid/errors/es-mx/ERR_PRECONDITION_FAILED
|
||||
share/squid/errors/es-mx/ERR_PROTOCOL_UNKNOWN
|
||||
share/squid/errors/es-mx/ERR_READ_ERROR
|
||||
share/squid/errors/es-mx/ERR_READ_TIMEOUT
|
||||
share/squid/errors/es-mx/ERR_SECURE_CONNECT_FAIL
|
||||
share/squid/errors/es-mx/ERR_SHUTTING_DOWN
|
||||
share/squid/errors/es-mx/ERR_SOCKET_FAILURE
|
||||
share/squid/errors/es-mx/ERR_TOO_BIG
|
||||
share/squid/errors/es-mx/ERR_UNSUP_HTTPVERSION
|
||||
share/squid/errors/es-mx/ERR_UNSUP_REQ
|
||||
share/squid/errors/es-mx/ERR_URN_RESOLVE
|
||||
share/squid/errors/es-mx/ERR_WRITE_ERROR
|
||||
share/squid/errors/es-mx/ERR_ZERO_SIZE_OBJECT
|
||||
share/squid/errors/es-mx/error-details.txt
|
||||
share/squid/errors/es-ni
|
||||
share/squid/errors/es-pa
|
||||
share/squid/errors/es-pe
|
||||
@@ -1639,6 +1683,7 @@ share/squid/errors/sl/ERR_URN_RESOLVE
|
||||
share/squid/errors/sl/ERR_WRITE_ERROR
|
||||
share/squid/errors/sl/ERR_ZERO_SIZE_OBJECT
|
||||
share/squid/errors/sl/error-details.txt
|
||||
share/squid/errors/spq
|
||||
share/squid/errors/sr
|
||||
share/squid/errors/sr-cyrl-cs
|
||||
share/squid/errors/sr-cyrl-me
|
||||
@@ -2203,6 +2248,7 @@ share/squid/mib.txt
|
||||
@dir share/squid/errors/el
|
||||
@dir share/squid/errors/en
|
||||
@dir share/squid/errors/es
|
||||
@dir share/squid/errors/es-mx
|
||||
@dir share/squid/errors/et
|
||||
@dir share/squid/errors/fa
|
||||
@dir share/squid/errors/fi
|
||||
|
||||
Reference in New Issue
Block a user