From 0717f703df8e37e2a7535e712d17769c85f7d1d6 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 9 Mar 2017 17:19:36 +0000 Subject: ccache-memcached: Fix crash due to shadowed manifest_name. Submitted to: https://github.com/ccache/ccache/pull/58 --- devel/ccache/Makefile | 5 +++-- devel/ccache/files/extra-patch-memcached-ccache.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 devel/ccache/files/extra-patch-memcached-ccache.c (limited to 'devel/ccache') diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index c4506720dded..015f4d1ce159 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -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 Memcached support 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 diff --git a/devel/ccache/files/extra-patch-memcached-ccache.c b/devel/ccache/files/extra-patch-memcached-ccache.c new file mode 100644 index 000000000000..5d04a3b2aa40 --- /dev/null +++ b/devel/ccache/files/extra-patch-memcached-ccache.c @@ -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; -- cgit v1.2.3