Attachment 155608 Details for Bug 198920 – patch for www/squid

[patch] patch for www/squid

mmap.patch_for_port (text/plain), 2.21 KB, created by Pavel Timofeev on 2015-04-15 07:55:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2015-04-15 07:55:28 UTC

Size: 2.21 KB

patch

obsolete

>diff -ruN /usr/home/timp/squid.orig/Makefile /usr/ports/www/squid/Makefile
>--- /usr/home/timp/squid.orig/Makefile	2015-04-15 10:34:31.072154000 +0300
>+++ /usr/ports/www/squid/Makefile	2015-04-15 10:52:48.310588000 +0300
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	squid
> PORTVERSION=	3.5.3
>+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}/ \
>diff -ruN /usr/home/timp/squid.orig/files/patch-src_DiskIO_Mmapped_MmappedFile.cc /usr/ports/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc
>--- /usr/home/timp/squid.orig/files/patch-src_DiskIO_Mmapped_MmappedFile.cc	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc	2015-04-15 10:44:33.837331000 +0300
>@@ -0,0 +1,11 @@
>+--- src/DiskIO/Mmapped/MmappedFile.cc.orig	2015-04-15 10:39:56.146312000 +0300
>++++ src/DiskIO/Mmapped/MmappedFile.cc	2015-04-15 10:40:53.487834000 +0300
>+@@ -235,7 +235,7 @@
>+     static const int pageSize = getpagesize();
>+     delta = offset % pageSize;
>+ 
>+-    buf = mmap(NULL, length + delta, prot, flags, fd, offset - delta);
>++    buf = mmap(NULL, length + delta, prot, flags | MAP_NOSYNC, fd, offset - delta);
>+ 
>+     if (buf == MAP_FAILED) {
>+         const int errNo = errno;
>diff -ruN /usr/home/timp/squid.orig/files/patch-src_ipc_mem_Segment.cc /usr/ports/www/squid/files/patch-src_ipc_mem_Segment.cc
>--- /usr/home/timp/squid.orig/files/patch-src_ipc_mem_Segment.cc	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/www/squid/files/patch-src_ipc_mem_Segment.cc	2015-04-15 10:43:59.990601000 +0300
>@@ -0,0 +1,11 @@
>+--- src/ipc/mem/Segment.cc.orig	2015-04-15 10:38:29.724278000 +0300
>++++ src/ipc/mem/Segment.cc	2015-04-15 10:39:37.130756000 +0300
>+@@ -150,7 +150,7 @@
>+     assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize)));
>+ 
>+     void *const p =
>+-        mmap(NULL, theSize, PROT_READ | PROT_WRITE, MAP_SHARED, theFD, 0);
>++        mmap(NULL, theSize, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NOSYNC, theFD, 0);
>+     if (p == MAP_FAILED) {
>+         debugs(54, 5, HERE << "mmap " << theName << ": " << xstrerror());
>+         fatalf("Ipc::Mem::Segment::attach failed to mmap(%s): %s\n",

Actions: View | Diff

Attachments on bug 198920: 154820 | 155608