diff options
| author | Sergei Kolobov <sergei@FreeBSD.org> | 2004-01-06 08:12:54 +0000 |
|---|---|---|
| committer | Sergei Kolobov <sergei@FreeBSD.org> | 2004-01-06 08:12:54 +0000 |
| commit | f34fe178a07e041c66af72c5a709e82d1aa959f1 (patch) | |
| tree | 3469c4b316160a7afb83c5b74e756f72a3d6f328 /www/squid31 | |
| parent | Add converters/asr10; provides access to Ensoniq EPS/EPS+/ASR devices (diff) | |
- Integrate a new patch issued by the squid development team
to correct the behaviour of the LDAP authentication helper wrt TLS,
see <http://www.squid-cache.org/Versions/v2/2.5/bugs/> for details
- Reinstate the errorpages.patch and work around its partial brokenness
by installing some Lithuanian error pages manually.
- Bump PORTREVISION
PR: 60950
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=97448
Diffstat (limited to 'www/squid31')
| -rw-r--r-- | www/squid31/Makefile | 11 | ||||
| -rw-r--r-- | www/squid31/distinfo | 2 | ||||
| -rw-r--r-- | www/squid31/pkg-plist | 5 |
3 files changed, 16 insertions, 2 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 9880375ae435..4db31b5b875b 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -7,7 +7,7 @@ PORTNAME= squid PORTVERSION= 2.5.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -27,6 +27,7 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-fqdnnegcache.patch \ pam_auth-2.2.patch \ squid-2.5.STABLE4_auth_param_doc.patch \ + squid-2.5.STABLE4-errorpages.patch \ squid-2.5.STABLE4-error_load_text.patch \ squid-2.5.STABLE4-xpi_mime.patch \ squid-2.5.STABLE4-size_overflow.patch \ @@ -51,7 +52,8 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-russian.patch \ squid-2.5.STABLE4-redirlog.patch \ squid-2.5.STABLE4-pinger.patch \ - squid-2.5.STABLE4-partial_reload.patch + squid-2.5.STABLE4-partial_reload.patch \ + squid-2.5.STABLE4-ldap_tls.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de @@ -170,4 +172,9 @@ post-install: ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \ fi +# Work around the fact that the errorpages.patch creates files in +# an "Attic" subdir: + @${FIND} ${WRKSRC}/errors/Lithuanian/Attic -type f \ + -exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \; + .include <bsd.port.mk> diff --git a/www/squid31/distinfo b/www/squid31/distinfo index a39321e1cdf1..98119333b057 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -5,6 +5,7 @@ MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c00 MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25 MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8 MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15 +MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7 MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647 MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4 MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce @@ -30,3 +31,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-russian.patch) = 5a4357bd56134fc6578c435314c1a83 MD5 (squid2.5/squid-2.5.STABLE4-redirlog.patch) = 8a2cc15f2bde6fa263a9e40aae807f82 MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34 +MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284 diff --git a/www/squid31/pkg-plist b/www/squid31/pkg-plist index ed60ba42d402..fa28b0b99d1d 100644 --- a/www/squid31/pkg-plist +++ b/www/squid31/pkg-plist @@ -470,9 +470,12 @@ etc/squid/errors/Lithuanian/ERR_DNS_FAIL etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED etc/squid/errors/Lithuanian/ERR_FTP_DISABLED etc/squid/errors/Lithuanian/ERR_FTP_FAILURE +etc/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN +etc/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED +etc/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE etc/squid/errors/Lithuanian/ERR_INVALID_REQ etc/squid/errors/Lithuanian/ERR_INVALID_URL etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP @@ -480,7 +483,9 @@ etc/squid/errors/Lithuanian/ERR_NO_RELAY etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS etc/squid/errors/Lithuanian/ERR_READ_ERROR etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT +etc/squid/errors/Lithuanian/ERR_SHUTTING_DOWN etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE +etc/squid/errors/Lithuanian/ERR_TOO_BIG etc/squid/errors/Lithuanian/ERR_UNSUP_REQ etc/squid/errors/Lithuanian/ERR_URN_RESOLVE etc/squid/errors/Lithuanian/ERR_WRITE_ERROR |