svn commit: r305557 - in head/security/cryptopp: . files

Xin LI delphij at FreeBSD.org
Tue Oct 9 06:28:44 UTC 2012


Author: delphij
Date: Mon Oct  8 21:55:37 2012
New Revision: 305557
URL: http://svn.freebsd.org/changeset/ports/305557

Log:
  Add a few casts to initializer of int array when the constant is greater
  than 0x7fffffff, as they have exceeded the range of standard int.  This
  makes the code to compile when -std=c++11.
  
  The resulting binary was not changed by this commit.  PORTREVISION
  not bumped intentionally as this is a build fix.
  
  While I'm there, also convert the header to new style.
  
  PR:		ports/171525
  Submitted by:	Michael Gmelin <freebsd grem de>

Added:
  head/security/cryptopp/files/patch-wake.cpp   (contents, props changed)
Modified:
  head/security/cryptopp/Makefile

Modified: head/security/cryptopp/Makefile
==============================================================================
--- head/security/cryptopp/Makefile	Mon Oct  8 20:45:52 2012	(r305556)
+++ head/security/cryptopp/Makefile	Mon Oct  8 21:55:37 2012	(r305557)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   cryptopp
-# Date created:        18 January 2001
-# Whom:                George Reid <greid at ukug.uk.freebsd.org>
-#
+# Created by: George Reid <greid at ukug.uk.freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=		cryptopp
 PORTVERSION=		5.6.1

Added: head/security/cryptopp/files/patch-wake.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/cryptopp/files/patch-wake.cpp	Mon Oct  8 21:55:37 2012	(r305557)
@@ -0,0 +1,20 @@
+--- wake.cpp.orig
++++ wake.cpp
+@@ -25,13 +25,13 @@ void WAKE_Base::GenKey(word32 k0, word32 k1, word32 k2, word32 k3)
+ 	CRYPTOPP_COMPILE_ASSERT(sizeof(x) == 4);
+ 	static int tt[10]= {
+ 		0x726a8f3b,								 // table
+-		0xe69a3b5c,
+-		0xd3c71fe5,
+-		0xab3c73d2,
++		static_cast<int>(0xe69a3b5c),
++		static_cast<int>(0xd3c71fe5),
++		static_cast<int>(0xab3c73d2),
+ 		0x4d3a8eb3,
+ 		0x0396d6e8,
+ 		0x3d4c2f7a,
+-		0x9ee27cf3, } ;
++		static_cast<int>(0x9ee27cf3), } ;
+ 	t[0] = k0;
+ 	t[1] = k1;
+ 	t[2] = k2;



More information about the svn-ports-all mailing list