From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 25 17:50:10 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB0C5106564A for ; Thu, 25 Nov 2010 17:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8BFA78FC15 for ; Thu, 25 Nov 2010 17:50:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oAPHoAjj061751 for ; Thu, 25 Nov 2010 17:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oAPHoAxj061750; Thu, 25 Nov 2010 17:50:10 GMT (envelope-from gnats) Resent-Date: Thu, 25 Nov 2010 17:50:10 GMT Resent-Message-Id: <201011251750.oAPHoAxj061750@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Maxim Dounin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BE6A106564A for ; Thu, 25 Nov 2010 17:42:28 +0000 (UTC) (envelope-from mdounin@mdounin.ru) Received: from mdounin.cust.ramtel.ru (mdounin.cust.ramtel.ru [81.19.69.81]) by mx1.freebsd.org (Postfix) with ESMTP id 8164A8FC18 for ; Thu, 25 Nov 2010 17:42:27 +0000 (UTC) Received: by mdounin.cust.ramtel.ru (Postfix, from userid 1000) id 4C26217040; Thu, 25 Nov 2010 20:27:09 +0300 (MSK) Message-Id: <20101125172709.4C26217040@mdounin.cust.ramtel.ru> Date: Thu, 25 Nov 2010 20:27:09 +0300 (MSK) From: Maxim Dounin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: mnag@FreeBSD.org Subject: ports/152574: [PATCH] databases/memcached: repcached bugfix, minor port changes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Nov 2010 17:50:10 -0000 >Number: 152574 >Category: ports >Synopsis: [PATCH] databases/memcached: repcached bugfix, minor port changes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 25 17:50:10 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Maxim Dounin >Release: >Organization: >Environment: >Description: Changes with the included patch: 1. Upgrade repcached patch to version with cpu hog problem fixed. See here for more details: https://github.com/mdounin/memcached/commit/90ae0dfb122d4a13e3350eb6efd315f431e96772 2. Install include/memcached/protocol_binary.h. It looks like at least one program out there uses it (memcachetest). 3. Remove autotools/automake dependency, it's no longer needed. Removed file(s): - files/patch-Makefile.am Port maintainer (mnag@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- memcached-1.4.5_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/databases/memcached.orig/Makefile /usr/ports/databases/memcached/Makefile --- /usr/ports/databases/memcached.orig/Makefile Fri Oct 29 20:33:56 2010 +++ /usr/ports/databases/memcached/Makefile Thu Nov 25 20:14:22 2010 @@ -7,7 +7,7 @@ PORTNAME= memcached PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_GENTOO} @@ -20,8 +20,6 @@ CONFLICTS= memcached-1.2* -USE_AUTOTOOLS= autoconf:268 aclocal:111 automake:111 -AUTOMAKE_ARGS+= --add-missing USE_RC_SUBR= memcached GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --program-prefix= @@ -32,7 +30,9 @@ MAN1= memcached.1 PLIST_FILES= bin/memcached \ - bin/memcached-tool + bin/memcached-tool \ + include/memcached/protocol_binary.h +PLIST_DIRS= include/memcached PORTDOCS= protocol.txt threads.txt readme.txt @@ -44,10 +44,9 @@ .if defined(WITH_REPCACHED) # WWW: http://repcached.lab.klab.org/ -PATCH_SITES+= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= mm +PATCH_SITES+= http://mdounin.ru/files/ PATCH_DIST_STRIP+= -p1 -PATCHFILES+= repcached-2.2-${PORTVERSION}.patch.gz +PATCHFILES+= repcached-2.3-${PORTVERSION}.patch.gz CONFIGURE_ARGS+= --enable-replication .endif diff -ruN --exclude=CVS /usr/ports/databases/memcached.orig/distinfo /usr/ports/databases/memcached/distinfo --- /usr/ports/databases/memcached.orig/distinfo Fri Oct 29 20:33:56 2010 +++ /usr/ports/databases/memcached/distinfo Thu Nov 25 19:40:57 2010 @@ -1,6 +1,4 @@ -MD5 (memcached-1.4.5.tar.gz) = 583441a25f937360624024f2881e5ea8 SHA256 (memcached-1.4.5.tar.gz) = 9571b4b85484e46b3b10f07ccba77a1fa97d60660b32859f990effefb3005f91 SIZE (memcached-1.4.5.tar.gz) = 302516 -MD5 (repcached-2.2-1.4.5.patch.gz) = 84b95195ca3d8b31b9d8c47374856ef4 -SHA256 (repcached-2.2-1.4.5.patch.gz) = 423200894f3b4b8fcef45c6037ed5a930a7bc746377dc18b4fc6e0cb9270b1d1 -SIZE (repcached-2.2-1.4.5.patch.gz) = 13026 +SHA256 (repcached-2.3-1.4.5.patch.gz) = 73926f8a119910a79dd692b9c57f7f6806bd7f5644337f6aa31c949f53db0b79 +SIZE (repcached-2.3-1.4.5.patch.gz) = 19235 diff -ruN --exclude=CVS /usr/ports/databases/memcached.orig/files/patch-Makefile.am /usr/ports/databases/memcached/files/patch-Makefile.am --- /usr/ports/databases/memcached.orig/files/patch-Makefile.am Fri Oct 29 20:33:47 2010 +++ /usr/ports/databases/memcached/files/patch-Makefile.am Thu Jan 1 03:00:00 1970 @@ -1,8 +0,0 @@ ---- Makefile.am.orig 2010-07-25 19:31:54.258163012 +0200 -+++ Makefile.am 2010-07-25 19:34:35.321075314 +0200 -@@ -1,5 +1,4 @@ - bin_PROGRAMS = memcached --pkginclude_HEADERS = protocol_binary.h - noinst_PROGRAMS = memcached-debug sizes testapp timedrun - - BUILT_SOURCES= --- memcached-1.4.5_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: