From skv@FreeBSD.org  Sat Sep 23 17:38:40 2006
Return-Path: <skv@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8DAB016A415
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 23 Sep 2006 17:38:40 +0000 (UTC)
	(envelope-from skv@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2235443D58
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 23 Sep 2006 17:38:40 +0000 (GMT)
	(envelope-from skv@FreeBSD.org)
Received: from freefall.freebsd.org (skv@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8NHcdPM046761
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 23 Sep 2006 17:38:40 GMT
	(envelope-from skv@freefall.freebsd.org)
Received: (from skv@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8NHcdBn046760;
	Sat, 23 Sep 2006 17:38:39 GMT
	(envelope-from skv)
Message-Id: <200609231738.k8NHcdBn046760@freefall.freebsd.org>
Date: Sat, 23 Sep 2006 17:38:39 GMT
From: skv@freebsd.org
Reply-To: skv@freebsd.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: databases/memcached to 1.2.0
X-Send-Pr-Version: 3.2

>Number:         103523
>Category:       ports
>Synopsis:       Update port: databases/memcached to 1.2.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    seanc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 23 17:40:24 GMT 2006
>Closed-Date:    Thu Nov 30 13:32:43 GMT 2006
>Last-Modified:  Thu Nov 30 13:40:12 GMT 2006
>Originator:     Sergey Skvortsov
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
<Organization of PR author (multiple lines)>
>Environment:

	<Relevant environment information (multiple lines)>

>Description:

Update port: databases/memcached to 1.2.0

>How-To-Repeat:

	<Code/input/activities to reproduce the problem (multiple lines)>

>Fix:

? ppp
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/memcached/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	5 Jul 2006 13:49:49 -0000	1.17
+++ Makefile	23 Sep 2006 17:36:36 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	memcached
-PORTVERSION=	1.1.12
-PORTREVISION=	3
+PORTVERSION=	1.2.0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.danga.com/memcached/dist/ \
 		${MASTER_SITE_GENTOO}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/databases/memcached/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	9 Dec 2005 12:48:40 -0000	1.6
+++ distinfo	23 Sep 2006 17:36:36 -0000
@@ -1,3 +1,3 @@
-MD5 (memcached-1.1.12.tar.gz) = a1236dad33e9ac6c36d53faa8da61780
-SHA256 (memcached-1.1.12.tar.gz) = 6a8e63b02d8576a937dc154232357dbb9c236890be53e9ce0d44e2dba21ca79a
-SIZE (memcached-1.1.12.tar.gz) = 114103
+MD5 (memcached-1.2.0.tar.gz) = 6555a7b13b2c4ffa231b6043d13cc5ef
+SHA256 (memcached-1.2.0.tar.gz) = cadb9fb565c8d5695fcec7381094d47215c8c9956a677d5af0b259e0284e5aa7
+SIZE (memcached-1.2.0.tar.gz) = 143082
Index: files/patch-memcached.c
===================================================================
RCS file: /home/pcvs/ports/databases/memcached/files/patch-memcached.c,v
retrieving revision 1.4
diff -u -r1.4 patch-memcached.c
--- files/patch-memcached.c	3 Jul 2006 20:10:58 -0000	1.4
+++ files/patch-memcached.c	23 Sep 2006 17:36:36 -0000
@@ -1,12 +1,12 @@
---- memcached.c.orig	Mon Jul  3 13:04:31 2006
-+++ memcached.c	Mon Jul  3 13:04:40 2006
-@@ -1146,9 +1146,7 @@
-     setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
-     setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags));
-     setsockopt(sfd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling));
--#if !defined(TCP_NOPUSH)
-     setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags));
--#endif
+--- memcached.c.orig	Sat Sep  9 21:10:21 2006
++++ memcached.c	Sat Sep 23 21:33:25 2006
+@@ -1706,7 +1706,9 @@
+     } else {
+         setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags));
+         setsockopt(sfd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling));
++#if !defined(TCP_NOPUSH)
+         setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags));
++#endif
+     }
  
-     /* 
-      * the memset call clears nonstandard fields in some impementations
+     /*
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->seanc 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Sep 23 17:40:36 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103523 
State-Changed-From-To: open->closed 
State-Changed-By: skv 
State-Changed-When: Thu Nov 30 13:32:37 UTC 2006 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103523 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103523: commit references a PR
Date: Thu, 30 Nov 2006 13:33:50 +0000 (UTC)

 skv         2006-11-30 13:32:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/memcached  Makefile distinfo 
     databases/memcached/files patch-memcached.c 
   Log:
   Update to 1.2.0
   
   Changes:        http://code.sixapart.com/svn/memcached/tags/1.2.0/ChangeLog
   PR:             ports/103523
   Submitted by:   skv
   Approved by:    maintainer timeout (68 days)
   
   Revision  Changes    Path
   1.18      +4 -2      ports/databases/memcached/Makefile
   1.7       +3 -3      ports/databases/memcached/distinfo
   1.5       +11 -11    ports/databases/memcached/files/patch-memcached.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:

Note added by mnag@:

Please ignore changes to files/patch-memcached.c and remove this file. See why this patch are added.
