From owner-svn-ports-all@freebsd.org Thu Mar 9 17:19:37 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECA0FD04AEE; Thu, 9 Mar 2017 17:19:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A067B189; Thu, 9 Mar 2017 17:19:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v29HJarx059964; Thu, 9 Mar 2017 17:19:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v29HJanR059962; Thu, 9 Mar 2017 17:19:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201703091719.v29HJanR059962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 9 Mar 2017 17:19:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435780 - in head/devel/ccache: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2017 17:19:38 -0000 Author: bdrewery Date: Thu Mar 9 17:19:36 2017 New Revision: 435780 URL: https://svnweb.freebsd.org/changeset/ports/435780 Log: ccache-memcached: Fix crash due to shadowed manifest_name. Submitted to: https://github.com/ccache/ccache/pull/58 Added: head/devel/ccache/files/extra-patch-memcached-ccache.c (contents, props changed) Modified: head/devel/ccache/Makefile Modified: head/devel/ccache/Makefile ============================================================================== --- head/devel/ccache/Makefile Thu Mar 9 16:31:34 2017 (r435779) +++ head/devel/ccache/Makefile Thu Mar 9 17:19:36 2017 (r435780) @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery @@ -33,7 +33,8 @@ MEMCACHED_DESC= Build in experimental Me USES= compiler -MEMCACHED_EXTRA_PATCHES= ${FILESDIR}/extra-patch-memcached:-p1 +MEMCACHED_EXTRA_PATCHES= ${FILESDIR}/extra-patch-memcached:-p1 \ + ${FILESDIR}/extra-patch-memcached-ccache.c MEMCACHED_CONFIGURE_ENABLE= memcached MEMCACHED_USES= autoreconf pkgconfig MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached Added: head/devel/ccache/files/extra-patch-memcached-ccache.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ccache/files/extra-patch-memcached-ccache.c Thu Mar 9 17:19:36 2017 (r435780) @@ -0,0 +1,11 @@ +--- ccache.c.orig 2017-03-09 09:08:38.803365000 -0800 ++++ ccache.c 2017-03-09 09:08:42.059821000 -0800 +@@ -2153,7 +2153,7 @@ calculate_object_hash(struct args *args, + conf->direct_mode = false; + return NULL; + } +- char *manifest_name = hash_result(hash); ++ manifest_name = hash_result(hash); + manifest_path = get_path_in_cache(manifest_name, ".manifest"); + /* Check if the manifest file is there. */ + struct stat st;