cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch squid/stable to the 3.4 branch, and update squid/snapshot to a

Browse Source 
recent snapshot from the 3.5 branch
This commit is contained in:
sthen 2014-04-08 12:22:48 +00:00
parent 032ab8378d
commit 5d4f1010d1
27 changed files with 199 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/squid/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2013/11/15 19:09:17 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.2 2014/04/08 12:22:48 sthen Exp $
MULTI_PACKAGES= -main -ntlm
@ -6,7 +6,7 @@ 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
DISTNAME= squid-$V
DISTNAME?= squid-$V
EXTRACT_SUFX?= .tar.xz
PKGNAME-main= squid-$V
PKGNAME-ldap= squid-ldap-$V
@ -25,10 +25,10 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c m pthread stdc++
WANTLIB-main= ${WANTLIB} asn1 crypto db execinfo gssapi krb5 ssl \
com_err heimbase roken wind
WANTLIB-main += ${WANTLIB} asn1 com_err crypto db execinfo gssapi
WANTLIB-main += heimbase krb5 roken ssl wind
LIB_DEPENDS-main= ${LIB_DEPENDS} \
LIB_DEPENDS-main += ${LIB_DEPENDS} \
databases/db/v4 \
devel/libexecinfo
@ -72,6 +72,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-referer-log \
--enable-removal-policies="lru heap" \
--enable-ssl \
--with-openssl \
--enable-stacktraces \
--enable-storeio="aufs ufs diskd rock" \
--with-default-user="_squid" \
@ -88,7 +89,7 @@ CONFIGURE_ARGS+= --disable-pf-transparent \
# kerberos_ldap_group fails
CONFIGURE_ARGS+= --enable-external-acl-helpers="${EXTERNAL_ACL}"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV+= CPPFLAGS="`krb5-config --cflags` -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_header_et_com_err_h=false
E= ${TRUEPREFIX}/share/examples/squid
@ -101,13 +102,14 @@ TEST_DEPENDS= devel/cppunit
MULTI_PACKAGES+= -ldap
EXTERNAL_ACL+= LDAP_group eDirectory_userip
RUN_DEPENDS-ldap= ${BASE_PKGPATH}
LIB_DEPENDS-ldap= ${LIB_DEPENDS} databases/openldap
LIB_DEPENDS-ldap += ${LIB_DEPENDS} databases/openldap
WANTLIB-ldap += ${WANTLIB} asn1 com_err crypto gssapi krb5
WANTLIB-ldap += lber-2.4 ldap-2.4 sasl2 ssl wind
WANTLIB-ldap += com_err heimbase roken
.endif
RUN_DEPENDS-ntlm= net/samba,ads ${BASE_PKGPATH}
WANTLIB-ntlm += ${WANTLIB}
post-patch:
cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} LOCALBASE=${LOCALBASE} ./bootstrap.sh

16
www/squid/snapshot/Makefile
View File

@ -1,11 +1,21 @@
# $OpenBSD: Makefile,v 1.7 2014/03/16 13:15:12 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2014/04/08 12:22:48 sthen Exp $
V= 3.4.4
V= 3.5pre20140405
DISTNAME= squid-3.HEAD-20140405-r13341
EXTRACT_SUFX= .tar.bz2
EXTERNAL_ACL= LDAP_group SQL_session file_userip time_quota session \
unix_group wbinfo_group # kerberos_ldap_group (sasl/gssapi)
CONFIGURE_ARGS= --disable-strict-error-checking \
--disable-arch-native
--disable-arch-native \
--enable-ssl-crtd
WANTLIB-main += nettle
WANTLIB-ntlm += nettle
WANTLIB-ldap += nettle
LIB_DEPENDS-main += security/libnettle
LIB_DEPENDS-ntlm += security/libnettle
LIB_DEPENDS-ldap += security/libnettle
.include <bsd.port.mk>

4
www/squid/snapshot/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (squid-3.4.4.tar.xz) = gH8SzHvS/hE/hmqa0W2y6JuNLlPdLH5huNQnk+aPBBQ=
SIZE (squid-3.4.4.tar.xz) = 2226656
SHA256 (squid-3.HEAD-20140405-r13341.tar.bz2) = 8xAsGS7tqCAkVunLxcErHWFALNmaCSYtQEadvVlQEYI=
SIZE (squid-3.HEAD-20140405-r13341.tar.bz2) = 2901494

10
www/squid/snapshot/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2014/03/16 13:15:12 sthen Exp $
--- configure.ac.orig Sun Mar 9 09:42:04 2014
+++ configure.ac Sun Mar 16 13:07:07 2014
@@ -3051,6 +3051,14 @@ if test "x$squid_host_os" = "xmingw" ; then
$OpenBSD: patch-configure_ac,v 1.4 2014/04/08 12:22:48 sthen Exp $
--- configure.ac.orig Sat Apr 5 04:31:38 2014
+++ configure.ac Tue Apr 8 11:59:04 2014
@@ -2966,6 +2966,14 @@ if test "x$squid_host_os" = "xmingw" ; then
ac_cv_func_statfs='yes'
fi
@ -16,7 +16,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2014/03/16 13:15:12 sthen Exp $
dnl Check for library functions
AC_CHECK_FUNCS(\
backtrace_symbols_fd \
@@ -3203,6 +3211,9 @@ AC_CHECK_TYPE(struct cmsghdr,AC_DEFINE(HAVE_CMSGHDR,1,
@@ -3116,6 +3124,9 @@ AC_CHECK_TYPE(struct cmsghdr,AC_DEFINE(HAVE_CMSGHDR,1,
])
AC_CHECK_TYPE(struct iovec,AC_DEFINE(HAVE_IOVEC,1,[The system provides struct iovec]),,[

8
www/squid/snapshot/patches/patch-src_Makefile_am
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2013/11/15 19:09:17 sthen Exp $
--- src/Makefile.am.orig Thu Oct 3 13:32:47 2013
+++ src/Makefile.am Mon Oct 21 13:49:36 2013
@@ -652,6 +652,7 @@ squid_LDADD = \
$OpenBSD: patch-src_Makefile_am,v 1.2 2014/04/08 12:22:48 sthen Exp $
--- src/Makefile.am.orig Sat Apr 5 04:31:01 2014
+++ src/Makefile.am Tue Apr 8 11:59:04 2014
@@ -653,6 +653,7 @@ squid_LDADD = \
$(MINGW_LIBS) \
$(KRB5LIBS) \
$(COMPAT_LIB) \

8
www/squid/snapshot/patches/patch-src_cf_data_pre
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_cf_data_pre,v 1.2 2013/12/07 10:47:29 sthen Exp $
$OpenBSD: patch-src_cf_data_pre,v 1.3 2014/04/08 12:22:48 sthen Exp $
30 seconds is too long for rc.d
--- src/cf.data.pre.orig Sat Nov 30 13:20:43 2013
+++ src/cf.data.pre Wed Dec 4 14:34:52 2013
@@ -5735,7 +5735,7 @@ NAME: shutdown_lifetime
--- src/cf.data.pre.orig Sat Apr 5 04:31:03 2014
+++ src/cf.data.pre Tue Apr 8 11:59:04 2014
@@ -5948,7 +5948,7 @@ NAME: shutdown_lifetime
COMMENT: time-units
TYPE: time_t
LOC: Config.shutdownLifetime

8
www/squid/snapshot/patches/patch-src_client_side_reply_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_client_side_reply_cc,v 1.3 2014/03/16 13:15:12 sthen Exp $
--- src/client_side_reply.cc.orig Sun Mar 9 09:40:56 2014
+++ src/client_side_reply.cc Sun Mar 16 12:40:07 2014
@@ -1323,7 +1323,7 @@ clientReplyContext::buildReplyHeader()
$OpenBSD: patch-src_client_side_reply_cc,v 1.4 2014/04/08 12:22:48 sthen Exp $
--- src/client_side_reply.cc.orig Sat Apr 5 04:31:01 2014
+++ src/client_side_reply.cc Tue Apr 8 11:59:04 2014
@@ -1352,7 +1352,7 @@ clientReplyContext::buildReplyHeader()
if (http->storeEntry()->timestamp <= squid_curtime) {
// put X-Cache-Age: instead of Age:
char age[64];

3
www/squid/snapshot/pkg/DESCR-main
View File

@ -10,3 +10,6 @@ caching of failed requests.
Squid supports SSL, extensive access controls, and full request logging.
By using the lightweight Internet Cache Protocol, Squid caches can be
arranged in a hierarchy or mesh for additional bandwidth savings.
This package is for a DEVELOPMENT SNAPSHOT. Production servers should use
the released versions.

192
www/squid/snapshot/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1 2013/11/15 19:09:17 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2014/04/08 12:22:48 sthen Exp $
@newgroup _squid:515
@newuser _squid:515:_squid:daemon:Squid Account:/nonexistent:/sbin/nologin
@extraunexec rm -rf ${LOCALSTATEDIR}/cache/*
@ -11,7 +11,6 @@ libexec/squid/basic_db_auth
@bin libexec/squid/basic_fake_auth
@bin libexec/squid/basic_msnt_auth
@bin libexec/squid/basic_ncsa_auth
@bin libexec/squid/basic_nis_auth
libexec/squid/basic_pop3_auth
@bin libexec/squid/basic_radius_auth
@bin libexec/squid/cachemgr.cgi
@ -25,7 +24,10 @@ libexec/squid/ext_sql_session_acl
libexec/squid/helper-mux.pl
libexec/squid/log_db_daemon
@bin libexec/squid/log_file_daemon
@bin libexec/squid/negotiate_kerberos_auth
@bin libexec/squid/negotiate_kerberos_auth_test
@bin libexec/squid/negotiate_wrapper_auth
@bin libexec/squid/ssl_crtd
libexec/squid/storeid_file_rewrite
@bin libexec/squid/unlinkd
@bin libexec/squid/url_fake_rewrite
@ -41,6 +43,7 @@ libexec/squid/url_fake_rewrite.sh
@man man/man8/ext_time_quota_acl.8
@man man/man8/ext_unix_group_acl.8
@man man/man8/log_db_daemon.8
@man man/man8/negotiate_kerberos_auth.8
@man man/man8/squid.8
@man man/man8/storeid_file_rewrite.8
@bin sbin/squid
@ -1631,6 +1634,9 @@ share/squid/errors/sl/ERR_ZERO_SIZE_OBJECT
share/squid/errors/sl/error-details.txt
share/squid/errors/sr
share/squid/errors/sr-cyrl/
share/squid/errors/sr-cyrl-cs
share/squid/errors/sr-cyrl-me
share/squid/errors/sr-cyrl-rs
share/squid/errors/sr-cyrl/ERR_ACCESS_DENIED
share/squid/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED
share/squid/errors/sr-cyrl/ERR_AGENT_CONFIGURE
@ -1675,6 +1681,8 @@ share/squid/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT
share/squid/errors/sr-cyrl/error-details.txt
share/squid/errors/sr-latn/
share/squid/errors/sr-latn-cs
share/squid/errors/sr-latn-me
share/squid/errors/sr-latn-rs
share/squid/errors/sr-latn/ERR_ACCESS_DENIED
share/squid/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED
share/squid/errors/sr-latn/ERR_AGENT_CONFIGURE
@ -1717,6 +1725,7 @@ share/squid/errors/sr-latn/ERR_URN_RESOLVE
share/squid/errors/sr-latn/ERR_WRITE_ERROR
share/squid/errors/sr-latn/ERR_ZERO_SIZE_OBJECT
share/squid/errors/sr-latn/error-details.txt
share/squid/errors/sr-rs
share/squid/errors/sr-sp
share/squid/errors/sv/
share/squid/errors/sv-fi
@ -2025,95 +2034,102 @@ share/squid/errors/vi/ERR_URN_RESOLVE
share/squid/errors/vi/ERR_WRITE_ERROR
share/squid/errors/vi/ERR_ZERO_SIZE_OBJECT
share/squid/errors/vi/error-details.txt
share/squid/errors/zh-cn/
share/squid/errors/zh-cn/ERR_ACCESS_DENIED
share/squid/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED
share/squid/errors/zh-cn/ERR_AGENT_CONFIGURE
share/squid/errors/zh-cn/ERR_AGENT_WPAD
share/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
share/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
share/squid/errors/zh-cn/ERR_CANNOT_FORWARD
share/squid/errors/zh-cn/ERR_CONFLICT_HOST
share/squid/errors/zh-cn/ERR_CONNECT_FAIL
share/squid/errors/zh-cn/ERR_DIR_LISTING
share/squid/errors/zh-cn/ERR_DNS_FAIL
share/squid/errors/zh-cn/ERR_ESI
share/squid/errors/zh-cn/ERR_FORWARDING_DENIED
share/squid/errors/zh-cn/ERR_FTP_DISABLED
share/squid/errors/zh-cn/ERR_FTP_FAILURE
share/squid/errors/zh-cn/ERR_FTP_FORBIDDEN
share/squid/errors/zh-cn/ERR_FTP_NOT_FOUND
share/squid/errors/zh-cn/ERR_FTP_PUT_CREATED
share/squid/errors/zh-cn/ERR_FTP_PUT_ERROR
share/squid/errors/zh-cn/ERR_FTP_PUT_MODIFIED
share/squid/errors/zh-cn/ERR_FTP_UNAVAILABLE
share/squid/errors/zh-cn/ERR_GATEWAY_FAILURE
share/squid/errors/zh-cn/ERR_ICAP_FAILURE
share/squid/errors/zh-cn/ERR_INVALID_REQ
share/squid/errors/zh-cn/ERR_INVALID_RESP
share/squid/errors/zh-cn/ERR_INVALID_URL
share/squid/errors/zh-cn/ERR_LIFETIME_EXP
share/squid/errors/zh-cn/ERR_NO_RELAY
share/squid/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS
share/squid/errors/zh-cn/ERR_PRECONDITION_FAILED
share/squid/errors/zh-cn/ERR_READ_ERROR
share/squid/errors/zh-cn/ERR_READ_TIMEOUT
share/squid/errors/zh-cn/ERR_SECURE_CONNECT_FAIL
share/squid/errors/zh-cn/ERR_SHUTTING_DOWN
share/squid/errors/zh-cn/ERR_SOCKET_FAILURE
share/squid/errors/zh-cn/ERR_TOO_BIG
share/squid/errors/zh-cn/ERR_UNSUP_HTTPVERSION
share/squid/errors/zh-cn/ERR_UNSUP_REQ
share/squid/errors/zh-cn/ERR_URN_RESOLVE
share/squid/errors/zh-cn/ERR_WRITE_ERROR
share/squid/errors/zh-cn/ERR_ZERO_SIZE_OBJECT
share/squid/errors/zh-cn/error-details.txt
share/squid/errors/zh-cn
share/squid/errors/zh-hans/
share/squid/errors/zh-hans-cn
share/squid/errors/zh-hans-sg
share/squid/errors/zh-hans/ERR_ACCESS_DENIED
share/squid/errors/zh-hans/ERR_ACL_TIME_QUOTA_EXCEEDED
share/squid/errors/zh-hans/ERR_AGENT_CONFIGURE
share/squid/errors/zh-hans/ERR_AGENT_WPAD
share/squid/errors/zh-hans/ERR_CACHE_ACCESS_DENIED
share/squid/errors/zh-hans/ERR_CACHE_MGR_ACCESS_DENIED
share/squid/errors/zh-hans/ERR_CANNOT_FORWARD
share/squid/errors/zh-hans/ERR_CONFLICT_HOST
share/squid/errors/zh-hans/ERR_CONNECT_FAIL
share/squid/errors/zh-hans/ERR_DIR_LISTING
share/squid/errors/zh-hans/ERR_DNS_FAIL
share/squid/errors/zh-hans/ERR_ESI
share/squid/errors/zh-hans/ERR_FORWARDING_DENIED
share/squid/errors/zh-hans/ERR_FTP_DISABLED
share/squid/errors/zh-hans/ERR_FTP_FAILURE
share/squid/errors/zh-hans/ERR_FTP_FORBIDDEN
share/squid/errors/zh-hans/ERR_FTP_NOT_FOUND
share/squid/errors/zh-hans/ERR_FTP_PUT_CREATED
share/squid/errors/zh-hans/ERR_FTP_PUT_ERROR
share/squid/errors/zh-hans/ERR_FTP_PUT_MODIFIED
share/squid/errors/zh-hans/ERR_FTP_UNAVAILABLE
share/squid/errors/zh-hans/ERR_GATEWAY_FAILURE
share/squid/errors/zh-hans/ERR_ICAP_FAILURE
share/squid/errors/zh-hans/ERR_INVALID_REQ
share/squid/errors/zh-hans/ERR_INVALID_RESP
share/squid/errors/zh-hans/ERR_INVALID_URL
share/squid/errors/zh-hans/ERR_LIFETIME_EXP
share/squid/errors/zh-hans/ERR_NO_RELAY
share/squid/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS
share/squid/errors/zh-hans/ERR_PRECONDITION_FAILED
share/squid/errors/zh-hans/ERR_READ_ERROR
share/squid/errors/zh-hans/ERR_READ_TIMEOUT
share/squid/errors/zh-hans/ERR_SECURE_CONNECT_FAIL
share/squid/errors/zh-hans/ERR_SHUTTING_DOWN
share/squid/errors/zh-hans/ERR_SOCKET_FAILURE
share/squid/errors/zh-hans/ERR_TOO_BIG
share/squid/errors/zh-hans/ERR_UNSUP_HTTPVERSION
share/squid/errors/zh-hans/ERR_UNSUP_REQ
share/squid/errors/zh-hans/ERR_URN_RESOLVE
share/squid/errors/zh-hans/ERR_WRITE_ERROR
share/squid/errors/zh-hans/ERR_ZERO_SIZE_OBJECT
share/squid/errors/zh-hans/error-details.txt
share/squid/errors/zh-hant/
share/squid/errors/zh-hant-hk
share/squid/errors/zh-hant-mo
share/squid/errors/zh-hant-tw
share/squid/errors/zh-hant/ERR_ACCESS_DENIED
share/squid/errors/zh-hant/ERR_ACL_TIME_QUOTA_EXCEEDED
share/squid/errors/zh-hant/ERR_AGENT_CONFIGURE
share/squid/errors/zh-hant/ERR_AGENT_WPAD
share/squid/errors/zh-hant/ERR_CACHE_ACCESS_DENIED
share/squid/errors/zh-hant/ERR_CACHE_MGR_ACCESS_DENIED
share/squid/errors/zh-hant/ERR_CANNOT_FORWARD
share/squid/errors/zh-hant/ERR_CONFLICT_HOST
share/squid/errors/zh-hant/ERR_CONNECT_FAIL
share/squid/errors/zh-hant/ERR_DIR_LISTING
share/squid/errors/zh-hant/ERR_DNS_FAIL
share/squid/errors/zh-hant/ERR_ESI
share/squid/errors/zh-hant/ERR_FORWARDING_DENIED
share/squid/errors/zh-hant/ERR_FTP_DISABLED
share/squid/errors/zh-hant/ERR_FTP_FAILURE
share/squid/errors/zh-hant/ERR_FTP_FORBIDDEN
share/squid/errors/zh-hant/ERR_FTP_NOT_FOUND
share/squid/errors/zh-hant/ERR_FTP_PUT_CREATED
share/squid/errors/zh-hant/ERR_FTP_PUT_ERROR
share/squid/errors/zh-hant/ERR_FTP_PUT_MODIFIED
share/squid/errors/zh-hant/ERR_FTP_UNAVAILABLE
share/squid/errors/zh-hant/ERR_GATEWAY_FAILURE
share/squid/errors/zh-hant/ERR_ICAP_FAILURE
share/squid/errors/zh-hant/ERR_INVALID_REQ
share/squid/errors/zh-hant/ERR_INVALID_RESP
share/squid/errors/zh-hant/ERR_INVALID_URL
share/squid/errors/zh-hant/ERR_LIFETIME_EXP
share/squid/errors/zh-hant/ERR_NO_RELAY
share/squid/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS
share/squid/errors/zh-hant/ERR_PRECONDITION_FAILED
share/squid/errors/zh-hant/ERR_READ_ERROR
share/squid/errors/zh-hant/ERR_READ_TIMEOUT
share/squid/errors/zh-hant/ERR_SECURE_CONNECT_FAIL
share/squid/errors/zh-hant/ERR_SHUTTING_DOWN
share/squid/errors/zh-hant/ERR_SOCKET_FAILURE
share/squid/errors/zh-hant/ERR_TOO_BIG
share/squid/errors/zh-hant/ERR_UNSUP_HTTPVERSION
share/squid/errors/zh-hant/ERR_UNSUP_REQ
share/squid/errors/zh-hant/ERR_URN_RESOLVE
share/squid/errors/zh-hant/ERR_WRITE_ERROR
share/squid/errors/zh-hant/ERR_ZERO_SIZE_OBJECT
share/squid/errors/zh-hant/error-details.txt
share/squid/errors/zh-hk
share/squid/errors/zh-mo
share/squid/errors/zh-sg
share/squid/errors/zh-tw/
share/squid/errors/zh-tw/ERR_ACCESS_DENIED
share/squid/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED
share/squid/errors/zh-tw/ERR_AGENT_CONFIGURE
share/squid/errors/zh-tw/ERR_AGENT_WPAD
share/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
share/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
share/squid/errors/zh-tw/ERR_CANNOT_FORWARD
share/squid/errors/zh-tw/ERR_CONFLICT_HOST
share/squid/errors/zh-tw/ERR_CONNECT_FAIL
share/squid/errors/zh-tw/ERR_DIR_LISTING
share/squid/errors/zh-tw/ERR_DNS_FAIL
share/squid/errors/zh-tw/ERR_ESI
share/squid/errors/zh-tw/ERR_FORWARDING_DENIED
share/squid/errors/zh-tw/ERR_FTP_DISABLED
share/squid/errors/zh-tw/ERR_FTP_FAILURE
share/squid/errors/zh-tw/ERR_FTP_FORBIDDEN
share/squid/errors/zh-tw/ERR_FTP_NOT_FOUND
share/squid/errors/zh-tw/ERR_FTP_PUT_CREATED
share/squid/errors/zh-tw/ERR_FTP_PUT_ERROR
share/squid/errors/zh-tw/ERR_FTP_PUT_MODIFIED
share/squid/errors/zh-tw/ERR_FTP_UNAVAILABLE
share/squid/errors/zh-tw/ERR_GATEWAY_FAILURE
share/squid/errors/zh-tw/ERR_ICAP_FAILURE
share/squid/errors/zh-tw/ERR_INVALID_REQ
share/squid/errors/zh-tw/ERR_INVALID_RESP
share/squid/errors/zh-tw/ERR_INVALID_URL
share/squid/errors/zh-tw/ERR_LIFETIME_EXP
share/squid/errors/zh-tw/ERR_NO_RELAY
share/squid/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS
share/squid/errors/zh-tw/ERR_PRECONDITION_FAILED
share/squid/errors/zh-tw/ERR_READ_ERROR
share/squid/errors/zh-tw/ERR_READ_TIMEOUT
share/squid/errors/zh-tw/ERR_SECURE_CONNECT_FAIL
share/squid/errors/zh-tw/ERR_SHUTTING_DOWN
share/squid/errors/zh-tw/ERR_SOCKET_FAILURE
share/squid/errors/zh-tw/ERR_TOO_BIG
share/squid/errors/zh-tw/ERR_UNSUP_HTTPVERSION
share/squid/errors/zh-tw/ERR_UNSUP_REQ
share/squid/errors/zh-tw/ERR_URN_RESOLVE
share/squid/errors/zh-tw/ERR_WRITE_ERROR
share/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
share/squid/errors/zh-tw/error-details.txt
share/squid/errors/zh-tw
share/squid/icons/
share/squid/icons/SN.png
share/squid/icons/silk/

11
www/squid/stable/Makefile
View File

@ -1,8 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2014/03/16 12:58:48 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2014/04/08 12:22:48 sthen Exp $
V= 3.3.12
V= 3.4.4
EXTERNAL_ACL= SQL_session file_userip time_quota session unix_group \
wbinfo_group # kerberos_ldap_group (requires sasl)
EXTERNAL_ACL= LDAP_group SQL_session file_userip time_quota session \
unix_group wbinfo_group # kerberos_ldap_group (sasl/gssapi)
CONFIGURE_ARGS= --disable-strict-error-checking \
--disable-arch-native
.include <bsd.port.mk>

4
www/squid/stable/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (squid-3.3.12.tar.xz) = aMDjm/erjnifPdu+eozTQeRHi38iZGlyF/8FgCmE7II=
SIZE (squid-3.3.12.tar.xz) = 2187760
SHA256 (squid-3.4.4.tar.xz) = gH8SzHvS/hE/hmqa0W2y6JuNLlPdLH5huNQnk+aPBBQ=
SIZE (squid-3.4.4.tar.xz) = 2226656

2
www/squid/stable/patches/patch-acinclude_compiler-flags_m4
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-acinclude_compiler-flags_m4,v 1.1 2013/11/15 19:09:18 sthen Exp $
$OpenBSD: patch-acinclude_compiler-flags_m4,v 1.2 2014/04/08 12:22:48 sthen Exp $
Makes use of deprecated krb5_* functions.

8
www/squid/stable/patches/patch-bootstrap_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-bootstrap_sh,v 1.1 2013/11/15 19:09:18 sthen Exp $
--- bootstrap.sh.orig Sat Apr 27 04:34:48 2013
+++ bootstrap.sh Sat Apr 27 16:24:25 2013
@@ -137,7 +137,7 @@ do
$OpenBSD: patch-bootstrap_sh,v 1.2 2014/04/08 12:22:48 sthen Exp $
--- bootstrap.sh.orig Thu Oct 3 13:32:47 2013
+++ bootstrap.sh Mon Oct 21 13:49:36 2013
@@ -136,7 +136,7 @@ do
mkdir -p cfgaux
if test -n "$ltpath"; then

18
www/squid/stable/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.2 2013/12/07 10:47:21 sthen Exp $
--- configure.ac.orig Sat Nov 30 13:56:05 2013
+++ configure.ac Wed Dec 4 14:34:28 2013
@@ -3185,6 +3185,14 @@ if test "x$squid_host_os" = "xmingw" ; then
$OpenBSD: patch-configure_ac,v 1.3 2014/04/08 12:22:48 sthen Exp $
--- configure.ac.orig Sun Mar 9 09:42:04 2014
+++ configure.ac Sun Mar 16 13:07:07 2014
@@ -3051,6 +3051,14 @@ if test "x$squid_host_os" = "xmingw" ; then
ac_cv_func_statfs='yes'
fi
@ -16,3 +16,13 @@ $OpenBSD: patch-configure_ac,v 1.2 2013/12/07 10:47:21 sthen Exp $
dnl Check for library functions
AC_CHECK_FUNCS(\
backtrace_symbols_fd \
@@ -3203,6 +3211,9 @@ AC_CHECK_TYPE(struct cmsghdr,AC_DEFINE(HAVE_CMSGHDR,1,
])
AC_CHECK_TYPE(struct iovec,AC_DEFINE(HAVE_IOVEC,1,[The system provides struct iovec]),,[
+ #if HAVE_SYS_UIO_H
+ #include <sys/uio.h>
+ #endif
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif

11
www/squid/stable/patches/patch-helpers_basic_auth_DB_config_test
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-helpers_basic_auth_DB_config_test,v 1.1 2014/03/21 12:46:55 sthen Exp $
--- helpers/basic_auth/DB/config.test.orig Fri Mar 21 12:45:37 2014
+++ helpers/basic_auth/DB/config.test Fri Mar 21 12:45:53 2014
@@ -2,6 +2,6 @@
## Test: do we have perl to build the helper scripts?
## Test: do we have pod2man to build the manual?
-perl --version >/dev/null && echo | pod2man >/dev/null
+perl --version >/dev/null && echo | pod2man -h >/dev/null
exit $?

11
www/squid/stable/patches/patch-helpers_external_acl_SQL_session_config_test
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-helpers_external_acl_SQL_session_config_test,v 1.1 2014/03/21 12:46:55 sthen Exp $
--- helpers/external_acl/SQL_session/config.test.orig Fri Mar 21 12:45:37 2014
+++ helpers/external_acl/SQL_session/config.test Fri Mar 21 12:45:56 2014
@@ -2,6 +2,6 @@
## Test: do we have perl to build the helper scripts?
## Test: do we have pod2man to build the manual?
-perl --version >/dev/null && echo | pod2man >/dev/null
+perl --version >/dev/null && echo | pod2man -h >/dev/null
exit $?

2
www/squid/stable/patches/patch-helpers_external_acl_wbinfo_group_ext_wbinfo_group_acl_pl_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-helpers_external_acl_wbinfo_group_ext_wbinfo_group_acl_pl_in,v 1.1 2013/11/15 19:09:18 sthen Exp $
$OpenBSD: patch-helpers_external_acl_wbinfo_group_ext_wbinfo_group_acl_pl_in,v 1.2 2014/04/08 12:22:48 sthen Exp $
--- helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in.orig Sat Oct 20 13:39:49 2012
+++ helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.pl.in Fri Nov 9 21:55:59 2012
@@ -126,14 +126,14 @@ sub check {

11
www/squid/stable/patches/patch-helpers_log_daemon_DB_config_test
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-helpers_log_daemon_DB_config_test,v 1.1 2014/03/21 12:46:55 sthen Exp $
--- helpers/log_daemon/DB/config.test.orig Fri Mar 21 12:45:37 2014
+++ helpers/log_daemon/DB/config.test Fri Mar 21 12:45:59 2014
@@ -2,6 +2,6 @@
## Test: do we have perl to build the helper scripts?
## Test: do we have pod2man to build the manual?
-perl --version >/dev/null && echo | pod2man >/dev/null
+perl --version >/dev/null && echo | pod2man -h >/dev/null
exit $?

8
www/squid/stable/patches/patch-src_Makefile_am
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2013/11/15 19:09:18 sthen Exp $
--- src/Makefile.am.orig Sat Apr 27 04:34:48 2013
+++ src/Makefile.am Sat Apr 27 16:24:25 2013
@@ -649,6 +649,7 @@ squid_LDADD = \
$OpenBSD: patch-src_Makefile_am,v 1.2 2014/04/08 12:22:48 sthen Exp $
--- src/Makefile.am.orig Thu Oct 3 13:32:47 2013
+++ src/Makefile.am Mon Oct 21 13:49:36 2013
@@ -652,6 +652,7 @@ squid_LDADD = \
$(MINGW_LIBS) \
$(KRB5LIBS) \
$(COMPAT_LIB) \

8
www/squid/stable/patches/patch-src_cf_data_pre
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_cf_data_pre,v 1.2 2013/12/07 10:47:21 sthen Exp $
$OpenBSD: patch-src_cf_data_pre,v 1.3 2014/04/08 12:22:48 sthen Exp $
30 seconds is too long for rc.d
--- src/cf.data.pre.orig Sat Nov 30 13:55:13 2013
+++ src/cf.data.pre Wed Dec 4 14:34:28 2013
@@ -5300,7 +5300,7 @@ NAME: shutdown_lifetime
--- src/cf.data.pre.orig Sat Nov 30 13:20:43 2013
+++ src/cf.data.pre Wed Dec 4 14:34:52 2013
@@ -5735,7 +5735,7 @@ NAME: shutdown_lifetime
COMMENT: time-units
TYPE: time_t
LOC: Config.shutdownLifetime

8
www/squid/stable/patches/patch-src_client_side_reply_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_client_side_reply_cc,v 1.2 2014/03/16 12:58:48 sthen Exp $
--- src/client_side_reply.cc.orig Sun Mar 9 05:24:25 2014
+++ src/client_side_reply.cc Sun Mar 16 12:41:32 2014
@@ -1350,7 +1350,7 @@ clientReplyContext::buildReplyHeader()
$OpenBSD: patch-src_client_side_reply_cc,v 1.3 2014/04/08 12:22:48 sthen Exp $
--- src/client_side_reply.cc.orig Sun Mar 9 09:40:56 2014
+++ src/client_side_reply.cc Sun Mar 16 12:40:07 2014
@@ -1323,7 +1323,7 @@ clientReplyContext::buildReplyHeader()
if (http->storeEntry()->timestamp <= squid_curtime) {
// put X-Cache-Age: instead of Age:
char age[64];

2
www/squid/stable/patches/patch-src_squid_8_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_squid_8_in,v 1.1 2013/11/15 19:09:18 sthen Exp $
$OpenBSD: patch-src_squid_8_in,v 1.2 2014/04/08 12:22:48 sthen Exp $
--- src/squid.8.in.orig Tue Mar 12 10:15:58 2013
+++ src/squid.8.in Tue Mar 12 14:21:28 2013
@@ -194,12 +194,14 @@ Some packaging distributions block even that.

3
www/squid/stable/pkg/PLIST-ldap
View File

@ -1,8 +1,7 @@
@comment $OpenBSD: PLIST-ldap,v 1.1 2013/11/15 19:09:18 sthen Exp $
@comment $OpenBSD: PLIST-ldap,v 1.2 2014/04/08 12:22:48 sthen Exp $
@conflict squid-<3.3.5
@pkgpath www/squid,-ldap
@bin libexec/squid/basic_ldap_auth
@bin libexec/squid/digest_edirectory_auth
@bin libexec/squid/digest_ldap_auth
@bin libexec/squid/ext_edirectory_userip_acl
@bin libexec/squid/ext_ldap_group_acl

6
www/squid/stable/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2013/11/16 19:20:46 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2014/04/08 12:22:48 sthen Exp $
@pkgpath www/squid[,ldap][,ntlm][,snmp][,transparent]
@pkgpath www/squid,-main
@newgroup _squid:515
@ -17,6 +17,7 @@ libexec/squid/basic_db_auth
libexec/squid/basic_pop3_auth
@bin libexec/squid/basic_radius_auth
@bin libexec/squid/cachemgr.cgi
libexec/squid/cert_valid.pl
@bin libexec/squid/digest_file_auth
@bin libexec/squid/diskd
@bin libexec/squid/ext_file_userip_acl
@ -29,6 +30,7 @@ libexec/squid/log_db_daemon
@bin libexec/squid/negotiate_kerberos_auth
@bin libexec/squid/negotiate_kerberos_auth_test
@bin libexec/squid/negotiate_wrapper_auth
libexec/squid/storeid_file_rewrite
@bin libexec/squid/unlinkd
@bin libexec/squid/url_fake_rewrite
libexec/squid/url_fake_rewrite.sh
@ -45,6 +47,7 @@ libexec/squid/url_fake_rewrite.sh
@man man/man8/log_db_daemon.8
@man man/man8/negotiate_kerberos_auth.8
@man man/man8/squid.8
@man man/man8/storeid_file_rewrite.8
@bin sbin/squid
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/squid/
@ -1410,6 +1413,7 @@ share/squid/errors/pt-br/ERR_URN_RESOLVE
share/squid/errors/pt-br/ERR_WRITE_ERROR
share/squid/errors/pt-br/ERR_ZERO_SIZE_OBJECT
share/squid/errors/pt-br/error-details.txt
share/squid/errors/pt-bz
share/squid/errors/pt-pt
share/squid/errors/pt/ERR_ACCESS_DENIED
share/squid/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED

2
www/squid/stable/pkg/PLIST-ntlm
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ntlm,v 1.1 2013/11/15 19:09:18 sthen Exp $
@comment $OpenBSD: PLIST-ntlm,v 1.2 2014/04/08 12:22:48 sthen Exp $
@conflict squid-<3
@pkgpath www/squid,-ntlm
@bin libexec/squid/basic_smb_auth

2
www/squid/stable/pkg/README-main
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.1 2013/11/15 19:09:18 sthen Exp $
$OpenBSD: README-main,v 1.2 2014/04/08 12:22:48 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD

2
www/squid/stable/pkg/squid.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: squid.rc,v 1.1 2013/11/15 19:09:18 sthen Exp $
# $OpenBSD: squid.rc,v 1.2 2014/04/08 12:22:48 sthen Exp $
daemon="${TRUEPREFIX}/sbin/squid"