diff options
| author | ryoon <ryoon> | 2013-08-24 08:16:12 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2013-08-24 08:16:12 +0000 |
| commit | 66995dbf378e6750d2b7c1b5252706b1c7066e98 (patch) | |
| tree | 83c9cfa4b1d235c24f63e14b53742430a387e597 /security/crypto++ | |
| parent | ee49e827c8c4480b43f5503c8988e4042efc9db7 (diff) | |
| download | pkgsrc-66995dbf378e6750d2b7c1b5252706b1c7066e98.tar.gz | |
Bump PKGREVISION.
Fix PR pkg/48134 with patch from Onno van der Linden.
Fix build of net/amule.
Diffstat (limited to 'security/crypto++')
| -rw-r--r-- | security/crypto++/Makefile | 4 | ||||
| -rw-r--r-- | security/crypto++/distinfo | 3 | ||||
| -rw-r--r-- | security/crypto++/patches/patch-config.h | 31 |
3 files changed, 35 insertions, 3 deletions
diff --git a/security/crypto++/Makefile b/security/crypto++/Makefile index 0b485dc62e6..c483f506bca 100644 --- a/security/crypto++/Makefile +++ b/security/crypto++/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2013/08/22 13:15:04 ryoon Exp $ +# $NetBSD: Makefile,v 1.17 2013/08/24 08:16:12 ryoon Exp $ # DISTNAME= cryptopp562 PKGNAME= cryptopp-5.6.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cryptopp/} EXTRACT_SUFX= .zip diff --git a/security/crypto++/distinfo b/security/crypto++/distinfo index 59c38fb25d4..041ffa7ebb9 100644 --- a/security/crypto++/distinfo +++ b/security/crypto++/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.9 2013/08/22 13:15:04 ryoon Exp $ +$NetBSD: distinfo,v 1.10 2013/08/24 08:16:12 ryoon Exp $ SHA1 (cryptopp562.zip) = ddc18ae41c2c940317cd6efe81871686846fa293 RMD160 (cryptopp562.zip) = b41af768b3a5ba927dac44ec554dc2095e21b1bb Size (cryptopp562.zip) = 1137964 bytes SHA1 (patch-aa) = 9828c7da35f62bc696ee3c529b20ed3faee9b55b +SHA1 (patch-config.h) = d89c38eeaa51494c14fd6b6e7e6f436177bcfe0f diff --git a/security/crypto++/patches/patch-config.h b/security/crypto++/patches/patch-config.h new file mode 100644 index 00000000000..6b8a857e9ee --- /dev/null +++ b/security/crypto++/patches/patch-config.h @@ -0,0 +1,31 @@ +$NetBSD: patch-config.h,v 1.1 2013/08/24 08:16:12 ryoon Exp $ + +--- config.h.orig 2013-02-20 06: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 |