Date: Wed, 1 Feb 2017 20:22:34 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433100 - in head/net-p2p/bnbt: . files Message-ID: <201702012022.v11KMYk1069336@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Feb 1 20:22:34 2017 New Revision: 433100 URL: https://svnweb.freebsd.org/changeset/ports/433100 Log: net-p2p/bnbt: unbreak with libc++ 3.9 base64.cpp:129:13: error: assigning to 'char *' from incompatible type 'const char *' if ((b = strchr(s, pPad[0])) != NULL) // Only one, two or three equal... ^ ~~~~~~~~~~~~~~~~~~ Reported by: pkg-fallout Added: head/net-p2p/bnbt/files/patch-base64.cpp (contents, props changed) Modified: head/net-p2p/bnbt/Makefile (contents, props changed) Modified: head/net-p2p/bnbt/Makefile ============================================================================== --- head/net-p2p/bnbt/Makefile Wed Feb 1 20:22:24 2017 (r433099) +++ head/net-p2p/bnbt/Makefile Wed Feb 1 20:22:34 2017 (r433100) @@ -3,7 +3,7 @@ PORTNAME= bnbt PORTVERSION= 8.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p MASTER_SITES= http://opensource.depthstrike.com/${PORTNAME}/ DISTNAME= ${SNAPSHOT}-${PORTNAME}${PORTVERSION:C/\.//}-src Added: head/net-p2p/bnbt/files/patch-base64.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/bnbt/files/patch-base64.cpp Wed Feb 1 20:22:34 2017 (r433100) @@ -0,0 +1,26 @@ +--- base64.cpp.orig 2017-02-01 19:29:59 UTC ++++ base64.cpp +@@ -114,6 +114,7 @@ uchar pBase64[] = { + char *b64decode(const char *s) + { + int l = strlen(s); // Get length of Base64 string. ++ const char *p; // Separator position + char *b; // Decoding buffer pointers. + uchar c = 0; // Character to decode. + int x = 0; // General purpose integers. +@@ -126,12 +127,12 @@ char *b64decode(const char *s) + if (l % 4) // If it's not modulo 4, then it... + return b64isnot(NULL); // ...can't be a Base64 string. + +- if ((b = strchr(s, pPad[0])) != NULL) // Only one, two or three equal... ++ if ((p = strchr(s, pPad[0])) != NULL) // Only one, two or three equal... + { // ...'=' signs are allowed at... +- if ((b - s) < (l - 3)) // ...the end of the Base64 string. ++ if ((p - s) < (l - 3)) // ...the end of the Base64 string. + return b64isnot(NULL); // Any other equal '=' signs are... + else // ...invalid. +- if (strncmp(b, (const char *) pPad + 3 - (s + l - b), s + l - b)) ++ if (strncmp(p, (const char *) pPad + 3 - (s + l - p), s + l - p)) + return b64isnot(NULL); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702012022.v11KMYk1069336>