Commit d8592b9b authored by Simon F's avatar Simon F Committed by Natanael Copa

main/squid: Update to 4.2

parent ac7d5c26
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squid
pkgver=3.5.28
pkgver=4.2
pkgrel=0
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
......@@ -17,16 +17,17 @@ subpackages="$pkgname-doc"
linguas="af ar az bg ca cs da de el es et fa fi fr he hu hy id it ja ka ko lt
lv ms nl oc pl pt ro ru sk sl sr sv th tr uk uz vi zh"
langdir="/usr/share/squid/errors"
source="http://www.squid-cache.org/Versions/v3/${pkgver%.*}/squid-${pkgver}.tar.xz
bug-3679.patch
source="http://www.squid-cache.org/Versions/v4/squid-${pkgver}.tar.xz
squid.initd
squid.confd
$pkgname.initd
$pkgname.confd
$pkgname.logrotate
libressl.patch
"
pkgusers="squid"
pkggroups="squid"
builddir="$srcdir"/$pkgname-$pkgver
options="!check" # does not work with available cppunit
# secfixes:
# 3.5.27-r2:
......@@ -34,19 +35,8 @@ builddir="$srcdir"/$pkgname-$pkgver
# - CVE-2018-1000027
# - CVE-2018-1172
prepare() {
cd "$builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
find -name config.sub | xargs chmod u+w
}
build() {
cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
......@@ -63,7 +53,7 @@ build() {
--enable-auth-basic="getpwnam,NCSA,SMB,SMB_LM,RADIUS" \
--enable-epoll \
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group,session" \
--enable-auth-ntlm="fake,smb_lm" \
--enable-auth-ntlm="fake,SMB_LM" \
--enable-auth-negotiate="kerberos,wrapper" \
--disable-mit \
--enable-heimdal \
......@@ -85,10 +75,9 @@ build() {
--enable-follow-x-forwarded-for \
--with-large-files \
--with-default-user=squid \
--with-openssl \
|| return 1
--with-openssl
make || return 1
make
}
package() {
......@@ -112,8 +101,8 @@ squid_kerb_auth() {
install -d "$subpkgdir"/usr/lib/squid
mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/
}
sha512sums="da8367d364725c7fd6330e7588b0ff70d32978a17ca0bc5fe58fa6d12c9d2adb42ade0a492c835761bc7fd67c1a55300b4b7402ad939cf2a2aa5104233bbb74b squid-3.5.28.tar.xz
d44d0688a416ce993e186afe77051f764c7b01f452cfe27474a7876bc7f58e36c15c06978eedb189b98e276f512aa3bd58992a08668e89a5ef9cd843c22af72a bug-3679.patch
sha512sums="bd22e0ed646e14f3bf776b84fa8e78066a889216a5afa1f0a854070aeca67ffa88b25712d4ab3b147ab59343d3dc12a0e5d78c592d509134e05f8e301e0a95a9 squid-4.2.tar.xz
15d95f7d787be8c2e6619ef1661fd8aae8d2c1ede706748764644c7dc3d7c34515ef6e8b7543295fddc4e767bbd74a7cf8c42e77cf60b3d574ff11b3f6e336c9 squid.initd
7292661de344e8a87d855c83afce49511685d2680effab3afab110e45144c0117935f3bf73ab893c9e6d43f7fb5ba013635e24f6da6daf0eeb895ef2e9b5baa9 squid.confd
89a703fa4f21b6c7c26e64a46fd52407e20f00c34146ade0bea0c4b63d050117c0f8e218f2256a1fbf6abb84f4ec9b0472c9a4092ff6e78f07c4f5a25d0892a5 squid.logrotate"
89a703fa4f21b6c7c26e64a46fd52407e20f00c34146ade0bea0c4b63d050117c0f8e218f2256a1fbf6abb84f4ec9b0472c9a4092ff6e78f07c4f5a25d0892a5 squid.logrotate
55e35ebd892a0238e7cef47df1e7dae1adf470fd0543541ef50b266808cb6584b04b81fbf3e14c96b264315404e80e77d1f4364ddf27a6369c553077aff885e5 libressl.patch"
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1243,7 +1243,7 @@
if (def->cache_size <= 0 || entry->result == ACCESS_DUNNO)
return 1;
- if (entry->date + (entry->result == ACCESS_ALLOWED ? def->ttl : def->negative_ttl) < squid_curtime)
+ if (entry->date + (entry->result == ACCESS_ALLOWED ? def->ttl : def->negative_ttl) <= squid_curtime)
return 1;
else
return 0;
--- a/src/ssl/bio.cc
+++ b/src/ssl/bio.cc
@@ -76,7 +76,7 @@
BIO_meth_set_create(SquidMethods, squid_bio_create);
BIO_meth_set_destroy(SquidMethods, squid_bio_destroy);
}
- const BIO_METHOD *useMethod = SquidMethods;
+ BIO_METHOD *useMethod = SquidMethods;
#else
BIO_METHOD *useMethod = &SquidMethods;
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment