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

[John Marino]

Author: marino
Date: Wed Jul 30 07:07:16 2014
New Revision: 363448
URL: http://svnweb.freebsd.org/changeset/ports/363448
QAT: https://qat.redports.org/buildarchive/r363448/

Log:
  security/cryptopp: Add patch from pkgsrc
  
  The definition of CRYPTOPP_BOOL_ALIGN16_ENABLED was incorrect for i386.
  For NetBSD, this resulted in the inability to build cryptopp on i386.
  On FreeBSD, it built, but deskutils/cdcat choked on it while building on
  FreeBSD 10/i386 and FreeBSD 11/i386.
  
  PR:		192199
  Fix from:	pkgsrc security/crypto++
  Discussed:	NetBSD GNATS 48134
  Approved by:	delphi@

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

Modified: head/security/cryptopp/Makefile
==============================================================================
--- head/security/cryptopp/Makefile	Wed Jul 30 06:46:30 2014	(r363447)
+++ head/security/cryptopp/Makefile	Wed Jul 30 07:07:16 2014	(r363448)
@@ -3,7 +3,7 @@
 
 PORTNAME=		cryptopp
 PORTVERSION=		5.6.2
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		SF \
 			http://www.cryptopp.com/

Added: head/security/cryptopp/files/patch-config.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/cryptopp/files/patch-config.h	Wed Jul 30 07:07:16 2014	(r363448)
@@ -0,0 +1,29 @@
+--- config.h.orig	2013-02-20 14:30:54.000000000 +0000
++++ config.h
+@@ -290,12 +290,6 @@ NAMESPACE_END
+ 	#define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0
+ #endif
+ 
+-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
+-	#define CRYPTOPP_BOOL_ALIGN16_ENABLED 1
+-#else
+-	#define CRYPTOPP_BOOL_ALIGN16_ENABLED 0
+-#endif
+-
+ // how to allocate 16-byte aligned memory (for SSE2)
+ #if defined(CRYPTOPP_MSVC6PP_OR_LATER)
+ 	#define CRYPTOPP_MM_MALLOC_AVAILABLE
+@@ -307,6 +301,13 @@ NAMESPACE_END
+ 	#define CRYPTOPP_NO_ALIGNED_ALLOC
+ #endif
+ 
++#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || !defined(CPRYPTO_NO_ALIGNED_ALLOC)
++	#define CRYPTOPP_BOOL_ALIGN16_ENABLED 1
++#else
++	#define CRYPTOPP_BOOL_ALIGN16_ENABLED 0
++#endif
++
++
+ // how to disable inlining
+ #if defined(_MSC_VER) && _MSC_VER >= 1300
+ #	define CRYPTOPP_NOINLINE_DOTDOTDOT