Date: Wed, 2 Sep 2015 05:23:35 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395821 - in head/net-p2p/namecoin: . files Message-ID: <201509020523.t825NZsH013682@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Wed Sep 2 05:23:35 2015 New Revision: 395821 URL: https://svnweb.freebsd.org/changeset/ports/395821 Log: net-p2p/namecoin: fix for upcoming FORTIFY_SOURCE On FreeBSD strlcat and strcpy exist so you should be using the native libc versions instead of redefining your own. FORTIFY_SOURCE depends on using the system headers so this change fixes that case too. PR: 202603 Submitted by: pfg, op Approved by: milios@ccsys.com (maintainer) Added: head/net-p2p/namecoin/files/patch-src__strlcpy.h (contents, props changed) Modified: head/net-p2p/namecoin/Makefile Modified: head/net-p2p/namecoin/Makefile ============================================================================== --- head/net-p2p/namecoin/Makefile Wed Sep 2 04:22:41 2015 (r395820) +++ head/net-p2p/namecoin/Makefile Wed Sep 2 05:23:35 2015 (r395821) @@ -3,6 +3,7 @@ PORTNAME= namecoin PORTVERSION= 0.3.80 +PORTREVISION= 1 DISTVERSIONPREFIX= nc PORTEPOCH= 1 CATEGORIES= net-p2p dns Added: head/net-p2p/namecoin/files/patch-src__strlcpy.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/namecoin/files/patch-src__strlcpy.h Wed Sep 2 05:23:35 2015 (r395821) @@ -0,0 +1,23 @@ +--- net-p2p/namecoin/files/patch-src__strlcpy.h (revision 0) ++++ net-p2p/namecoin/files/patch-src__strlcpy.h (working copy) +@@ -0,0 +1,20 @@ ++--- src/strlcpy.h.orig 2015-08-24 00:28:33 UTC +++++ src/strlcpy.h ++@@ -15,6 +15,10 @@ ++ */ ++ #ifndef BITCOIN_STRLCPY_H ++ #define BITCOIN_STRLCPY_H +++ +++#if defined(__FreeBSD__) && (__FreeBSD_version >= 330000) +++#include <string.h> +++#else ++ /* ++ * Copy src to string dst of size siz. At most siz-1 characters ++ * will be copied. Always NUL terminates (unless siz == 0). ++@@ -83,4 +87,6 @@ inline size_t strlcat(char *dst, const c ++ ++ return(dlen + (s - src)); /* count does not include NUL */ ++ } +++#endif /* FreeBSD */ +++ ++ #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509020523.t825NZsH013682>