svn commit: r435780 - in head/devel/ccache: . files

[Bryan Drewery]

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;