diff options
| author | pi <pi@FreeBSD.org> | 2016-04-20 21:45:22 +0800 |
|---|---|---|
| committer | pi <pi@FreeBSD.org> | 2016-04-20 21:45:22 +0800 |
| commit | 75009bc87d47fdb47e7522304a31109a8277975f (patch) | |
| tree | 425943067d27f92c8d8b4e97c2af8d9f718597c0 /www | |
| parent | 8a87835a66b754c49dabc7335beeaf3a3760d23e (diff) | |
| download | freebsd-ports-gnome-75009bc87d47fdb47e7522304a31109a8277975f.tar.gz freebsd-ports-gnome-75009bc87d47fdb47e7522304a31109a8277975f.tar.zst freebsd-ports-gnome-75009bc87d47fdb47e7522304a31109a8277975f.zip | |
www/squid: Add all available official patches up to 14031
It fixes two annoying and long-standing problems:
- header forgery detection (using sslbump) leads to crash
- add chained certificates and signing certificate to
peek-then-bumped connections.
PR: 207901
MFH: 2016Q2
Submitted by: Pavel Timofeev <timp87@gmail.com> (maintainer)
Reported by: Christophe Anselme-Moizan <christophe.anselmemoizan@orange.com>
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid/Makefile | 13 | ||||
| -rw-r--r-- | www/squid/distinfo | 24 | ||||
| -rw-r--r-- | www/squid/files/patch-src__ip__Intercept.cc | 2 |
3 files changed, 38 insertions, 1 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 3e1d050b54d9..a1ae0b437033 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -2,6 +2,7 @@ PORTNAME= squid PORTVERSION= 3.5.16 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -17,6 +18,18 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://master.squid-cache.org/~amosjeffries/patches/:nosid PATCH_SITE_SUBDIR= Versions/v3/${PORTVERSION:R}/changesets +PATCHFILES= squid-3.5-14020.patch \ + squid-3.5-14021.patch \ + squid-3.5-14022.patch \ + squid-3.5-14023.patch \ + squid-3.5-14024.patch \ + squid-3.5-14025.patch \ + squid-3.5-14026.patch \ + squid-3.5-14027.patch \ + squid-3.5-14028.patch \ + squid-3.5-14029.patch \ + squid-3.5-14030.patch \ + squid-3.5-14031.patch MAINTAINER= timp87@gmail.com COMMENT= HTTP Caching Proxy diff --git a/www/squid/distinfo b/www/squid/distinfo index d0096efb3c5c..a8feea5f4003 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,2 +1,26 @@ SHA256 (squid3.5/squid-3.5.16.tar.xz) = e73d821180eed8bed230f357c680c0b19f1efa51a24725e810f2b48a2079d385 SIZE (squid3.5/squid-3.5.16.tar.xz) = 2317320 +SHA256 (squid3.5/squid-3.5-14020.patch) = ef2ca3158e9dc86a5a6fd4d76a6dc2d2fdf817ec45811e2c033f2bb27255debf +SIZE (squid3.5/squid-3.5-14020.patch) = 2080 +SHA256 (squid3.5/squid-3.5-14021.patch) = de498c8cbed75cf32f8de01bd2ccec1aac88fa1534223a18c2cac6d161847d3a +SIZE (squid3.5/squid-3.5-14021.patch) = 1513 +SHA256 (squid3.5/squid-3.5-14022.patch) = 5722068a8e6bf28a150f95daf91cca646c8d0f23fbb471d363ee3c7c3278707d +SIZE (squid3.5/squid-3.5-14022.patch) = 2145 +SHA256 (squid3.5/squid-3.5-14023.patch) = 0c89fec2091ca23ee031dc76147bfe2f0100518bdf78dd635110cb091530a73c +SIZE (squid3.5/squid-3.5-14023.patch) = 1763 +SHA256 (squid3.5/squid-3.5-14024.patch) = 0a833174ddb3d8906b0bb9933894e1932b3d4ac37406febed1090fbcc0fcd79e +SIZE (squid3.5/squid-3.5-14024.patch) = 1475 +SHA256 (squid3.5/squid-3.5-14025.patch) = d66e885114c98c607fb24a0d774ac5456d6883100b04a49077dc682a05246725 +SIZE (squid3.5/squid-3.5-14025.patch) = 1542 +SHA256 (squid3.5/squid-3.5-14026.patch) = 6de1cca5db2151550f9dc23a2a51731cf1b3d6dfbde446cf654f638527b9ff9d +SIZE (squid3.5/squid-3.5-14026.patch) = 1811 +SHA256 (squid3.5/squid-3.5-14027.patch) = 8bdd1684c4b595bc0e89e4ec7cb130aedc854f166493e8324128b0485c54bcd5 +SIZE (squid3.5/squid-3.5-14027.patch) = 1766 +SHA256 (squid3.5/squid-3.5-14028.patch) = 1a9b79a1ddfdd87608019cec12f23fd4421aef366c9065a6c8564ea197f093b3 +SIZE (squid3.5/squid-3.5-14028.patch) = 1841 +SHA256 (squid3.5/squid-3.5-14029.patch) = 0693035319cd505a3c39195fc141ab41d43f2526b96f906d2904837b24ebec3e +SIZE (squid3.5/squid-3.5-14029.patch) = 4945 +SHA256 (squid3.5/squid-3.5-14030.patch) = 45b05b3e446d5376818bc59b64afe617737833f4ee20fa25d5c28c74ecf86990 +SIZE (squid3.5/squid-3.5-14030.patch) = 1361 +SHA256 (squid3.5/squid-3.5-14031.patch) = 02699ad5956835eb72dbc5f503da17f50b72d08a5fd14ab14b0d4221c66a1587 +SIZE (squid3.5/squid-3.5-14031.patch) = 6238 diff --git a/www/squid/files/patch-src__ip__Intercept.cc b/www/squid/files/patch-src__ip__Intercept.cc index cc0371094555..7bb4250b30d0 100644 --- a/www/squid/files/patch-src__ip__Intercept.cc +++ b/www/squid/files/patch-src__ip__Intercept.cc @@ -8,7 +8,7 @@ + // warn once every million at critical level, then push down a level each repeated event static int warningLevel = DBG_CRITICAL; debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1"); -- warningLevel = ++warningLevel % 10; +- warningLevel = (warningLevel + 1) % 10; + warningLevel = (warningLevel + 1) % 1048576; return false; #else |