squid5: replaced by squid

This commit is contained in:
Joshua Root
2025-01-11 09:17:38 +11:00
parent ebc7f04615
commit 4930c70c2c
9 changed files with 7 additions and 237 deletions
+1 -1
View File
@@ -54,7 +54,7 @@ platform darwin {
depends_build path:bin/pkg-config:pkgconfig
depends_lib port:libtool port:zlib
conflicts squid2 squid3 squid5
conflicts squid2 squid3
compiler.cxx_standard 2017
+1 -1
View File
@@ -46,7 +46,7 @@ patchfiles patch-cf.data.pre.diff \
depends_lib port:zlib
conflicts squid squid3 squid5
conflicts squid squid3
# replace old config.{guess,sub} with recent versions from automake
depends_build-append port:automake
+1 -1
View File
@@ -51,7 +51,7 @@ platform darwin 10 {
depends_build path:bin/pkg-config:pkgconfig
depends_lib port:zlib
conflicts squid squid2 squid5
conflicts squid squid2
set pidfile ${prefix}/var/run/squid/squid.pid
+4 -156
View File
@@ -1,165 +1,13 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
PortGroup obsolete 1.0
name squid5
replaced_by squid
version 5.10
revision 1
categories net
license GPL-2+
maintainers {jmr @jmroot} openmaintainer
description advanced proxy caching server for http, https, ftp, gopher
long_description Squid is a high-performance proxy caching server for \
web clients, supporting FTP, gopher, and HTTP data \
objects. Squid keeps metadata and \
especially hot objects cached in RAM, caches DNS \
lookups, supports non-blocking DNS lookups, and \
implements negative caching of failed requests. \
Squid 5.x is the previous release series, and needs a \
C++11 compiler to build.
homepage http://www.squid-cache.org/
master_sites https://mirror.aarnet.edu.au/pub/squid/squid/ \
https://www.mirrorservice.org/sites/ftp.squid-cache.org/pub/squid/ \
http://ftp.ring.gr.jp/archives/net/www/squid/ \
ftp://ftp.is.co.za/pub/squid/ \
ftp://ftp1.cl.squid-cache.org/pub/squid/ \
http://www.squid-cache.org/Versions/v5/ \
ftp://ftp.squid-cache.org/pub/squid/
distname squid-${version}
use_xz yes
checksums md5 0e4ab51b4a4db75dfc8040e4aaeb32a2 \
sha1 6305f422be4fea00198a87ac57e78e51d833ae43 \
rmd160 125a333fc638984a95884d1e0315456d4beb7974 \
sha256 ed832577670462935ddfc1d612e8cff1416d51e6cecba1688a8e47c6db736de1
patchfiles patch-compat_types.h.diff \
patch-basic_pam_auth.cc.diff \
kerberos_ldap_group_Makefile.in.diff
platform darwin 10 {
# ticket #37102, /usr/include/rpcsvc/yp_prot.h tries to redefine bool
patchfiles-append snowleopard-bool.diff
}
depends_build path:bin/pkg-config:pkgconfig
depends_lib port:expat port:zlib
conflicts squid squid2 squid3
compiler.cxx_standard 2011
configure.args --mandir=${prefix}/share/man \
--sysconfdir=${prefix}/etc/squid \
--datadir=${prefix}/share/squid \
--localstatedir=${prefix}/var/squid \
--libexecdir=${prefix}/libexec/squid \
--with-swapdir=${prefix}/var/squid/cache \
--with-pidfile=${prefix}/var/run/squid/squid.pid \
--disable-strict-error-checking \
--disable-loadable-modules \
--disable-arch-native \
--without-cppunit \
--without-gnugss \
--without-gnutls \
--without-libxml2 \
--without-mit-krb5 \
--without-heimdal-krb5 \
--without-nettle \
--without-openssl \
--enable-delay-pools \
--enable-follow-x-forwarded-for \
--enable-zph-qos \
--enable-removal-policies \
--enable-storeio=ufs,aufs,diskd,rock \
--enable-log-daemon-helpers \
--with-default-user=squid \
--enable-auth \
--enable-auth-basic \
--enable-auth-digest \
--enable-auth-negotiate="wrapper" \
--enable-auth-ntlm
platform darwin {
# Doesn't work and just generates failure messages in the log
configure.args-append --disable-eui
}
post-configure {
if {[variant_exists universal] && [variant_isset universal]} {
system -W ${worksrcpath} "ed - include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
}
}
startupitem.create yes
startupitem.name Squid
startupitem.netchange yes
startupitem.executable ${prefix}/sbin/squid -s --foreground
add_users squid group=squid home=${prefix}/var/squid
notes "Before starting $name for the first time, create the cache directories\
with:
${prefix}/sbin/squid -s -z --foreground
Squid 5.x is no longer the current release series. Migrating to Squid\
6 is recommended. The squid5 port will be marked as replaced by squid\
in late 2024, at which point upgrading squid5 will automatically\
install squid."
post-destroot {
xinstall -o squid -g squid -m 755 -d \
${destroot}${prefix}/var/run/squid ${destroot}${prefix}/var/squid \
${destroot}${prefix}/var/squid/cache ${destroot}${prefix}/var/squid/logs
file delete -force ${destroot}${prefix}/etc/squid/squid.conf \
${destroot}${prefix}/etc/squid/mime.conf \
${destroot}${prefix}/etc/squid/cachemgr.conf \
${destroot}${prefix}/etc/squid/errorpage.css
}
destroot.keepdirs ${destroot}${prefix}/var/run/squid \
${destroot}${prefix}/var/squid/cache \
${destroot}${prefix}/var/squid/logs
post-activate {
# Make sure initial conf files are present and setup correctly
foreach f { squid.conf mime.conf cachemgr.conf errorpage.css } {
if {![file exists ${prefix}/etc/squid/${f}]} {
file copy ${prefix}/etc/squid/${f}.default \
${prefix}/etc/squid/${f}
}
}
}
variant openssl conflicts gnutls description "Enable SSL/TLS support using OpenSSL" {
depends_lib-append path:lib/libssl.dylib:openssl
configure.args-delete --without-openssl
configure.args-append --with-openssl=${prefix}
}
if {![variant_isset gnutls]} {
default_variants +openssl
}
variant gnutls conflicts openssl description "Enable SSL/TLS support using GnuTLS (experimental)" {
depends_lib-append path:lib/pkgconfig/gnutls.pc:gnutls
configure.args-delete --without-gnutls
}
variant ipfw_transparent description "Enable transparent proxy support using IPFW" {
configure.args-append --enable-ipfw-transparent
}
variant kerberos description "Enable MIT kerberos support" {
depends_lib-append port:kerberos5
configure.args-delete --enable-auth-negotiate="wrapper" \
--without-mit-krb5
configure.args-append --enable-auth-negotiate
}
variant ssl_crtd requires openssl description "Enable use of external certificate generator (for SSL-Bump)" {
configure.args-append --enable-ssl-crtd
}
livecheck.type regex
livecheck.url http://www.squid-cache.org/Versions/v5/
livecheck.regex "squid-(\[0-9.\]+)-RELEASENOTES\\.html"
# Remove after 2026-01-11
-22
View File
@@ -1,22 +0,0 @@
/#define SIZEOF_LONG/c
#ifdef __LP64__
#define SIZEOF_LONG 8
#else
#define SIZEOF_LONG 4
#endif
.
/#define SIZEOF_SIZE_T/c
#ifdef __LP64__
#define SIZEOF_SIZE_T 8
#else
#define SIZEOF_SIZE_T 4
#endif
.
/#define SIZEOF_VOID_P/c
#ifdef __LP64__
#define SIZEOF_VOID_P 8
#else
#define SIZEOF_VOID_P 4
#endif
.
w
@@ -1,11 +0,0 @@
--- src/acl/external/kerberos_ldap_group/Makefile.in.orig 2018-10-28 07:45:10.000000000 +1100
+++ src/acl/external/kerberos_ldap_group/Makefile.in 2018-11-22 13:23:53.000000000 +1100
@@ -650,7 +650,7 @@
WBINFO = @WBINFO@
WIN32_PSAPI = @WIN32_PSAPI@
XMLLIB = @XMLLIB@
-XTRA_LIBS = @XTRA_LIBS@
+XTRA_LIBS = @XTRA_LIBS@ -lresolv
XTRA_OBJS = @XTRA_OBJS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -1,14 +0,0 @@
--- src/auth/basic/PAM/basic_pam_auth.cc.orig 2018-07-02 13:26:07.000000000 +1000
+++ src/auth/basic/PAM/basic_pam_auth.cc 2018-07-22 14:11:40.000000000 +1000
@@ -84,6 +84,11 @@
#endif
#if HAVE_SECURITY_PAM_APPL_H
#include <security/pam_appl.h>
+#elif defined(__APPLE__)
+#include <AvailabilityMacros.h>
+#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+#include <pam/pam_appl.h>
+#endif
#endif
/* The default PAM service name */
@@ -1,20 +0,0 @@
--- compat/types.h.orig 2009-08-04 21:57:45.000000000 +1000
+++ compat/types.h 2009-08-09 11:34:31.000000000 +1000
@@ -93,7 +93,7 @@
#ifndef PRId64
#if _SQUID_WINDOWS_
#define PRId64 "I64d"
-#elif SIZEOF_INT64_T > SIZEOF_LONG
+#elif SIZEOF_INT64_T >= SIZEOF_LONG
#define PRId64 "lld"
#else
#define PRId64 "ld"
@@ -103,7 +103,7 @@
#ifndef PRIu64
#if _SQUID_WINDOWS_
#define PRIu64 "I64u"
-#elif SIZEOF_INT64_T > SIZEOF_LONG
+#elif SIZEOF_INT64_T >= SIZEOF_LONG
#define PRIu64 "llu"
#else
#define PRIu64 "lu"
-11
View File
@@ -1,11 +0,0 @@
--- src/auth/basic/NIS/nis_support.cc.orig 2018-07-02 13:26:07.000000000 +1000
+++ src/auth/basic/NIS/nis_support.cc 2018-07-22 14:15:33.000000000 +1000
@@ -23,7 +23,7 @@
#include <rpc/rpc.h>
#endif
-#if _SQUID_FREEBSD_ && !defined(BOOL_DEFINED)
+#ifndef BOOL_DEFINED
// BUG: FreeBSD rpcsvc/yp_* headers try to redefine bool unless we match their non-standard hack.
#define BOOL_DEFINED
#endif