sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ccache-memcached: Fix crash due to shadowed manifest_name.

Browse source 
Submitted to:	https://github.com/ccache/ccache/pull/58
This commit is contained in:
Bryan Drewery 2017-03-09 17:19:36 +00:00
parent 66ff0de22c
commit 0717f703df
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=435780
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devel/ccache/Makefile
View file

@ -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

11
devel/ccache/files/extra-patch-memcached-ccache.c Normal file
View file

@ -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;