diff options
| author | markd <markd@pkgsrc.org> | 2013-02-19 19:22:45 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2013-02-19 19:22:45 +0000 |
| commit | 93fe95c9ce315fabc8d2c0569409432bffef4ccb (patch) | |
| tree | bd1d0f3c73659c3773200f5553bbc43dc982c2c1 /www/squid3 | |
| parent | 245b4191df557f785ca971448ab819469fd77982 (diff) | |
| download | pkgsrc-93fe95c9ce315fabc8d2c0569409432bffef4ccb.tar.gz | |
Add upstream patch 12497. Fixes diskd complaints about no filename in shm
buffer. Bump PKGREVISION
Diffstat (limited to 'www/squid3')
| -rw-r--r-- | www/squid3/Makefile | 3 | ||||
| -rw-r--r-- | www/squid3/distinfo | 3 | ||||
| -rw-r--r-- | www/squid3/patches/patch-src_DiskIO_DiskDaemon_diskd.cc | 36 |
3 files changed, 40 insertions, 2 deletions
diff --git a/www/squid3/Makefile b/www/squid3/Makefile index a631a8740e6..12bd7daf85a 100644 --- a/www/squid3/Makefile +++ b/www/squid3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2013/02/10 18:16:53 adam Exp $ +# $NetBSD: Makefile,v 1.2 2013/02/19 19:22:45 markd Exp $ DISTNAME= squid-3.3.1 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ ${SQUID_MASTER_SITES} diff --git a/www/squid3/distinfo b/www/squid3/distinfo index ca463ae18f9..636f75f10f5 100644 --- a/www/squid3/distinfo +++ b/www/squid3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2013/02/10 18:16:53 adam Exp $ +$NetBSD: distinfo,v 1.2 2013/02/19 19:22:45 markd Exp $ SHA1 (squid-3.3.1.tar.xz) = d996c5b49bb244aad69e45c85499c8cb1f2c4716 RMD160 (squid-3.3.1.tar.xz) = 1419cc29351a5a784456fb0f447fced59f42f0fd @@ -6,6 +6,7 @@ Size (squid-3.3.1.tar.xz) = 2173060 bytes SHA1 (patch-configure) = 8e5eb49a8d04c77f3cf9de9390a8992268421cb6 SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf +SHA1 (patch-src_DiskIO_DiskDaemon_diskd.cc) = f815c33ba6b11aae2b0e661605e3fd7fc291cbf1 SHA1 (patch-src_Makefile.in) = 919797e74c378daad88b5ac1ee7efe6f5f580a33 SHA1 (patch-src_acl_DomainData.cc) = 19b223e4c976179f40343074d531434c1ed78b9b SHA1 (patch-src_acl_Url.cc) = 418a4d8bf9600601363c5353e063a5eeced81088 diff --git a/www/squid3/patches/patch-src_DiskIO_DiskDaemon_diskd.cc b/www/squid3/patches/patch-src_DiskIO_DiskDaemon_diskd.cc new file mode 100644 index 00000000000..acdbedc9e4d --- /dev/null +++ b/www/squid3/patches/patch-src_DiskIO_DiskDaemon_diskd.cc @@ -0,0 +1,36 @@ +$NetBSD: patch-src_DiskIO_DiskDaemon_diskd.cc,v 1.1 2013/02/19 19:22:45 markd Exp $ + +------------------------------------------------------------ +revno: 12497 +revision-id: squid3@treenet.co.nz-20130214091437-0kf8k09qf1sg8ker +parent: squid3@treenet.co.nz-20130214091347-nkfdacfkt0urnwq4 +fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3763 +committer: Amos Jeffries <squid3@treenet.co.nz> +branch nick: 3.3 +timestamp: Thu 2013-02-14 02:14:37 -0700 +message: + Bug 3763: diskd Error: no filename in shm buffer +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3@treenet.co.nz-20130214091437-0kf8k09qf1sg8ker +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 +# testament_sha1: 6098b2dbc1bcd0230017a40b0ebd75e375148fec +# timestamp: 2013-02-14 09:15:28 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 +# base_revision_id: squid3@treenet.co.nz-20130214091347-\ +# nkfdacfkt0urnwq4 +# +# Begin patch +=== modified file 'src/DiskIO/DiskDaemon/diskd.cc' +--- src/DiskIO/DiskDaemon/diskd.cc 2013-01-02 10:09:54 +0000 ++++ src/DiskIO/DiskDaemon/diskd.cc 2013-02-14 09:14:37 +0000 +@@ -264,7 +264,7 @@ + + if (s->shm_offset > -1) + buf = shmbuf + s->shm_offset; +- else { ++ else if (r->mtype != _MQD_CLOSE) { + fprintf(stderr, "%d UNLNK id(%u) Error: no filename in shm buffer\n", (int) mypid, s->id); + return; + } + |