CVS commit: [pkgsrc-2017Q4] pkgsrc/www/squid3

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Mon Feb  5 09:38:18 UTC 2018

Modified Files:
        pkgsrc/www/squid3 [pkgsrc-2017Q4]: Makefile distinfo

Log Message:
Pullup ticket #5700 - requested by taca
www/squid3: security update

Revisions pulled up:
- www/squid3/Makefile                                           1.79-1.80
- www/squid3/distinfo                                           1.62

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Tue Jan 23 02:28:49 UTC 2018

   Modified Files:
        pkgsrc/www/squid3: Makefile distinfo

   Log Message:
   www/squid3: Add security patches

   Add two official security patches.

   o Denial of service attack when processing ESI responses
   o Denial of service attack when processing ESI responses or downloading
     intermediate CA certificates

        http://www.squid-cache.org/Advisories/SQUID-2018_1.txt
        http://www.squid-cache.org/Advisories/SQUID-2018_2.txt

   Bump PKGREVISION.

   To generate a diff of this commit:
   cvs rdiff -u -r1.78 -r1.79 pkgsrc/www/squid3/Makefile
   cvs rdiff -u -r1.61 -r1.62 pkgsrc/www/squid3/distinfo

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        veego
   Date:                Thu Jan 25 16:54:28 UTC 2018

   Modified Files:
        pkgsrc/www/squid3: Makefile

   Log Message:
   Add missing PATCH_SITES for the new patch files in the last commit.

   To generate a diff of this commit:
   cvs rdiff -u -r1.79 -r1.80 pkgsrc/www/squid3/Makefile


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.78.6.1 pkgsrc/www/squid3/Makefile
cvs rdiff -u -r1.61 -r1.61.6.1 pkgsrc/www/squid3/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/squid3/Makefile
diff -u pkgsrc/www/squid3/Makefile:1.78 pkgsrc/www/squid3/Makefile:1.78.6.1
--- pkgsrc/www/squid3/Makefile:1.78     Tue Sep  5 08:09:08 2017
+++ pkgsrc/www/squid3/Makefile  Mon Feb  5 09:38:18 2018
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.78 2017/09/05 08:09:08 dholland Exp $
+# $NetBSD: Makefile,v 1.78.6.1 2018/02/05 09:38:18 spz Exp $
 
 DISTNAME=      squid-3.5.27
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/
 MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/
 MASTER_SITES+= http://ftp.nluug.nl/internet/squid/
 EXTRACT_SUFX=  .tar.xz
 
+PATCH_SITES=           http://www.squid-cache.org/Versions/v3/3.5/changesets/
+PATCHFILES=            SQUID-2018_1.patch SQUID-2018_2.patch
+PATCH_DIST_STRIP=      -p1
+
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.squid-cache.org/
 COMMENT=       Post-Harvest_cached WWW proxy cache and accelerator

Index: pkgsrc/www/squid3/distinfo
diff -u pkgsrc/www/squid3/distinfo:1.61 pkgsrc/www/squid3/distinfo:1.61.6.1
--- pkgsrc/www/squid3/distinfo:1.61     Mon Aug 21 09:19:12 2017
+++ pkgsrc/www/squid3/distinfo  Mon Feb  5 09:38:18 2018
@@ -1,5 +1,13 @@
-$NetBSD: distinfo,v 1.61 2017/08/21 09:19:12 adam Exp $
+$NetBSD: distinfo,v 1.61.6.1 2018/02/05 09:38:18 spz Exp $
 
+SHA1 (SQUID-2018_1.patch) = e0b13479e183b831a754c89c34f10533ef042beb
+RMD160 (SQUID-2018_1.patch) = 23dd75b517f00a819f1f629d41ace08680275175
+SHA512 (SQUID-2018_1.patch) = d08d87d4cf97e794735e29ed2a273e27757a9ef95059cf6a2e2855a0c56e92d9e665b85115c9f3b699974447a7b9cccadb0a8ce606beedb41d27df8361241f8b
+Size (SQUID-2018_1.patch) = 1092 bytes
+SHA1 (SQUID-2018_2.patch) = 896a38f3a4cc60d18109e65e82f3515d6b8fd033
+RMD160 (SQUID-2018_2.patch) = 35730b31e8cee8565bbe81c49102822cad9858eb
+SHA512 (SQUID-2018_2.patch) = 392442527ead5cbb045f6eded522c9aff6ce395034ca028e7298394eccb6ed5b06c814f966ddc6cb264b9a37bf7ae2751e3ed87853566b1d7b757d99280fe60c
+Size (SQUID-2018_2.patch) = 1054 bytes
 SHA1 (squid-3.5.27.tar.xz) = 1e69c96d13cd49844da3bcf33a0b428fbe7b6f77
 RMD160 (squid-3.5.27.tar.xz) = d3426f5d4ebda4834d069b4cc4bb3366fc4873b4
 SHA512 (squid-3.5.27.tar.xz) = 4172a053c3b7ffe7a12dfb3febac96942d0fbbe7e98e3f797f22cd75b0a3a89cbbfe7260b5daad099e79d5e9303bb5dfbfee7499cb30a90590aa1bd242ff4817