update to squid-3.5.26

This commit is contained in:
sthen 2017-06-03 21:04:49 +00:00
parent edc5d31615
commit 3379847204
6 changed files with 7 additions and 92 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.197 2017/05/31 08:08:17 espie Exp $
# $OpenBSD: Makefile,v 1.198 2017/06/03 21:04:49 sthen Exp $
COMMENT-main= WWW and FTP proxy cache and accelerator
COMMENT-ldap= LDAP authentication/ACL support for Squid
COMMENT-ntlm= NTLM authentication/ACL support for Squid
V= 3.5.25
V= 3.5.26
DISTNAME= squid-$V
REVISION= 0
EXTRACT_SUFX= .tar.xz
PKGNAME-main= squid-$V
PKGNAME-ldap= squid-ldap-$V
@ -22,7 +21,9 @@ MAINTAINER= Stuart Henderson <sthen@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c m nettle pthread
cWANTLIB = ${WANTLIB} ${LIBECXX} ffi gmp gnutls hogweed iconv idn2 intl p11-kit tasn1 z
cWANTLIB= ${WANTLIB} ${LIBECXX} ffi gmp gnutls hogweed iconv
cWANTLIB+= idn2 intl p11-kit tasn1 unistring z
# bzr repository at https://code.launchpad.net/squid
MASTER_SITES= ${HOMEPAGE}Versions/v${V:C/^([0-9]).*/\1/}/${V:C/([0-9.]{3}).*/\1/}/ \

View File

@ -1,2 +1,2 @@
SHA256 (squid-3.5.25.tar.xz) = KJWSVMMrjNh+lZm2vrlzUs8GOFJOD1rD4XVPCEYvNYU=
SIZE (squid-3.5.25.tar.xz) = 2327316
SHA256 (squid-3.5.26.tar.xz) = uqHuy31uGIgfRFUGDYDufLla5+JpX9zPfiHMyPh5qYI=
SIZE (squid-3.5.26.tar.xz) = 2328352

View File

@ -1,41 +0,0 @@
$OpenBSD: patch-helpers_basic_auth_LDAP_basic_ldap_auth_8,v 1.1 2017/05/11 16:29:55 schwarze Exp $
Index: helpers/basic_auth/LDAP/basic_ldap_auth.8
--- helpers/basic_auth/LDAP/basic_ldap_auth.8.orig
+++ helpers/basic_auth/LDAP/basic_ldap_auth.8
@@ -5,9 +5,9 @@ basic_ldap_auth \- LDAP authentication helper for Squi
.
.SH SYNOPSIS
.if !'po4a'hide' .B basic_ldap_auth
-.if !'po4a'hide' .B \-b\ \"
+.if !'po4a'hide' .B \-b\ \(dq
base DN
-.if !'po4a'hide' .B \"\ [\-u
+.if !'po4a'hide' .B \(dq\ [\-u
attribute
.if !'po4a'hide' .B ]\ [
options
@@ -20,11 +20,11 @@ URI
.if !'po4a'hide' .B ]...
.br
.if !'po4a'hide' .B basic_ldap_auth
-.if !'po4a'hide' .B \-b\ \"
+.if !'po4a'hide' .B \-b\ \(dq
base DN
-.if !'po4a'hide' .B \"\ \-f\ \"
+.if !'po4a'hide' .B \(dq\ \-f\ \(dq
LDAP search filter
-.if !'po4a'hide' .B \"\ [
+.if !'po4a'hide' .B \(dq\ [
options
.if !'po4a'hide' .B ]\ [
LDAP server name
@@ -74,7 +74,7 @@ not what builds the user specific part of the users DN
The search filter can contain up to 15 occurrences of
.B %s
which will be replaced by the username, as in
-.B "\"uid\=%s\""
+.B "\(dquid\=%s\(dq"
for RFC2037 directories. For a detailed description of LDAP search
filter syntax see RFC2254.
.br

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-helpers_basic_auth_RADIUS_basic_radius_auth_8,v 1.1 2017/05/11 16:29:55 schwarze Exp $
Index: helpers/basic_auth/RADIUS/basic_radius_auth.8
--- helpers/basic_auth/RADIUS/basic_radius_auth.8.orig
+++ helpers/basic_auth/RADIUS/basic_radius_auth.8
@@ -9,9 +9,9 @@ basic_radius_auth \- Squid RADIUS authentication helpe
config file
.br
.if !'po4a'hide' .B basic_radius_auth
-.if !'po4a'hide' .B "\-h \""
+.if !'po4a'hide' .B "\-h \(dq"
server name
-.if !'po4a'hide' .B "\" [\-p "
+.if !'po4a'hide' .B "\(dq [\-p "
port
.if !'po4a'hide' .B "] [\-i "
identifier

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-helpers_external_acl_file_userip_ext_file_userip_acl_8,v 1.1 2017/05/11 16:29:55 schwarze Exp $
Index: helpers/external_acl/file_userip/ext_file_userip_acl.8
--- helpers/external_acl/file_userip/ext_file_userip_acl.8.orig
+++ helpers/external_acl/file_userip/ext_file_userip_acl.8
@@ -68,7 +68,7 @@ There are other two directives,
.B ALL
and
.B NONE
-, which mean \"any user on this IP address may authenticate\" or \"no user on this IP address may authenticate\".
+, which mean \(dqany user on this IP address may authenticate\(dq or \(dqno user on this IP address may authenticate\(dq.
.
.SH AUTHOR
This program was written by

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-tools_squidclient_squidclient_1,v 1.1 2017/05/11 16:29:55 schwarze Exp $
Index: tools/squidclient/squidclient.1
--- tools/squidclient/squidclient.1.orig
+++ tools/squidclient/squidclient.1
@@ -86,7 +86,7 @@ Retrieve URL from server host. Default is
.if !'po4a'hide' .TP
.if !'po4a'hide' .B "\-H 'string'"
Extra headers to send. Use
-.B '\\n'
+.B '\en'
for new lines.
.
.if !'po4a'hide' .TP