mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-26 05:02:18 +00:00
security/py-pycryptopp: unbreak CLANG build
- Drop GCC usage - Maintainer's timeout (wen@FreeBSD.org) PR: 183849 Submitted by: <senno@example.com>
This commit is contained in:
Bartek Rutkowski
parent
877d95500a
commit
f1da60efc1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=381218
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= pycryptopp
|
||||
PORTVERSION= 0.5.29
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= security python
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
@ -15,14 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}darcsver>0:${PORTSDIR}/devel/py-darcsver \
|
||||
${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:${PORTSDIR}/devel/py-setuptools_darcs
|
||||
RUN_DEPENDS:= ${BUILD_DEPENDS}
|
||||
|
||||
USE_GCC= yes
|
||||
USES= python
|
||||
USE_PYTHON= distutils autoplist
|
||||
|
||||
post-extract:
|
||||
@${REINPLACE_CMD} -e 's#<malloc.h>#<stdlib.h>#g' \
|
||||
${WRKSRC}/embeddedcryptopp/rijndael.cpp \
|
||||
${WRKSRC}/embeddedcryptopp/config.h \
|
||||
${WRKSRC}/embeddedcryptopp/secblock.h
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
229
security/py-pycryptopp/files/patch-299a99e
Normal file
229
security/py-pycryptopp/files/patch-299a99e
Normal file
@ -0,0 +1,229 @@
|
||||
From 299a99ed04d93d811fe3039fc669253644fba848 Mon Sep 17 00:00:00 2001
|
||||
From: Zooko O'Whielacronx <zooko@zooko.com>
|
||||
Date: Wed, 25 Jan 2012 05:27:37 -0700
|
||||
Subject: apply http://bazaar.launchpad.net/~zooko/cryptopp/trunk/revision/466
|
||||
, which I believe is Wei Dai's attempt to fix
|
||||
https://tahoe-lafs.org/trac/pycryptopp/ticket/44
|
||||
|
||||
---
|
||||
embeddedcryptopp/cryptlib.cpp | 9 ++++++++-
|
||||
embeddedcryptopp/cryptlib.h | 9 +--------
|
||||
embeddedcryptopp/misc.h | 43 +++++++++++++++++--------------------------
|
||||
embeddedcryptopp/rijndael.cpp | 8 --------
|
||||
embeddedcryptopp/secblock.h | 9 +++++----
|
||||
embeddedcryptopp/smartptr.h | 4 ++--
|
||||
embeddedcryptopp/stdcpp.h | 18 +++++++++++-------
|
||||
7 files changed, 44 insertions(+), 56 deletions(-)
|
||||
|
||||
diff --git embeddedcryptopp/cryptlib.cpp embeddedcryptopp/cryptlib.cpp
|
||||
index 0e5bd24..dadd9ce 100644
|
||||
--- embeddedcryptopp/cryptlib.cpp
|
||||
+++ embeddedcryptopp/cryptlib.cpp
|
||||
@@ -30,7 +30,14 @@ const std::string DEFAULT_CHANNEL;
|
||||
const std::string AAD_CHANNEL = "AAD";
|
||||
const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL;
|
||||
|
||||
-const NullNameValuePairs g_nullNameValuePairs;
|
||||
+class NullNameValuePairs : public NameValuePairs
|
||||
+{
|
||||
+public:
|
||||
+ bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const {return false;}
|
||||
+};
|
||||
+
|
||||
+simple_ptr<NullNameValuePairs> s_pNullNameValuePairs(new NullNameValuePairs);
|
||||
+const NameValuePairs &g_nullNameValuePairs = *s_pNullNameValuePairs.m_p;
|
||||
|
||||
BufferedTransformation & TheBitBucket()
|
||||
{
|
||||
diff --git embeddedcryptopp/cryptlib.h embeddedcryptopp/cryptlib.h
|
||||
index 15cd6da..b5faa58 100644
|
||||
--- embeddedcryptopp/cryptlib.h
|
||||
+++ embeddedcryptopp/cryptlib.h
|
||||
@@ -318,14 +318,7 @@ DOCUMENTED_NAMESPACE_BEGIN(Name)
|
||||
DOCUMENTED_NAMESPACE_END
|
||||
|
||||
//! empty set of name-value pairs
|
||||
-class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs
|
||||
-{
|
||||
-public:
|
||||
- bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const {return false;}
|
||||
-};
|
||||
-
|
||||
-//! _
|
||||
-extern CRYPTOPP_DLL const NullNameValuePairs g_nullNameValuePairs;
|
||||
+extern CRYPTOPP_DLL const NameValuePairs &g_nullNameValuePairs;
|
||||
|
||||
// ********************************************************
|
||||
|
||||
diff --git embeddedcryptopp/misc.h embeddedcryptopp/misc.h
|
||||
index de8037b..b7317e9 100644
|
||||
--- embeddedcryptopp/misc.h
|
||||
+++ embeddedcryptopp/misc.h
|
||||
@@ -6,7 +6,6 @@
|
||||
#include <string.h> // for memcpy and memmove
|
||||
|
||||
#ifdef _MSC_VER
|
||||
- #include <stdlib.h>
|
||||
#if _MSC_VER >= 1400
|
||||
// VC2005 workaround: disable declarations that conflict with winnt.h
|
||||
#define _interlockedbittestandset CRYPTOPP_DISABLED_INTRINSIC_1
|
||||
@@ -101,9 +100,9 @@ struct NewObject
|
||||
T* operator()() const {return new T;}
|
||||
};
|
||||
|
||||
-/*! This function safely initializes a static object in a multithreaded environment without using locks.
|
||||
- It may leak memory when two threads try to initialize the static object at the same time
|
||||
- but this should be acceptable since each static object is only initialized once per session.
|
||||
+/*! This function safely initializes a static object in a multithreaded environment without using locks (for portability).
|
||||
+ Note that if two threads call Ref() at the same time, they may get back different references, and one object
|
||||
+ may end up being memory leaked. This is by design.
|
||||
*/
|
||||
template <class T, class F = NewObject<T>, int instance=0>
|
||||
class Singleton
|
||||
@@ -121,31 +120,23 @@ private:
|
||||
template <class T, class F, int instance>
|
||||
const T & Singleton<T, F, instance>::Ref(CRYPTOPP_NOINLINE_DOTDOTDOT) const
|
||||
{
|
||||
- static simple_ptr<T> s_pObject;
|
||||
- static char s_objectState = 0;
|
||||
+ static volatile simple_ptr<T> s_pObject;
|
||||
+ T *p = s_pObject.m_p;
|
||||
|
||||
-retry:
|
||||
- switch (s_objectState)
|
||||
+ if (p)
|
||||
+ return *p;
|
||||
+
|
||||
+ T *newObject = m_objectFactory();
|
||||
+ p = s_pObject.m_p;
|
||||
+
|
||||
+ if (p)
|
||||
{
|
||||
- case 0:
|
||||
- s_objectState = 1;
|
||||
- try
|
||||
- {
|
||||
- s_pObject.m_p = m_objectFactory();
|
||||
- }
|
||||
- catch(...)
|
||||
- {
|
||||
- s_objectState = 0;
|
||||
- throw;
|
||||
- }
|
||||
- s_objectState = 2;
|
||||
- break;
|
||||
- case 1:
|
||||
- goto retry;
|
||||
- default:
|
||||
- break;
|
||||
+ delete newObject;
|
||||
+ return *p;
|
||||
}
|
||||
- return *s_pObject.m_p;
|
||||
+
|
||||
+ s_pObject.m_p = newObject;
|
||||
+ return *newObject;
|
||||
}
|
||||
|
||||
// ************** misc functions ***************
|
||||
diff --git embeddedcryptopp/rijndael.cpp embeddedcryptopp/rijndael.cpp
|
||||
index 1699e1f..ba9bcc8 100644
|
||||
--- embeddedcryptopp/rijndael.cpp
|
||||
+++ embeddedcryptopp/rijndael.cpp
|
||||
@@ -69,14 +69,6 @@ being unloaded from L1 cache, until that round is finished.
|
||||
#include "misc.h"
|
||||
#include "cpu.h"
|
||||
|
||||
-#ifdef __sun
|
||||
-#include <alloca.h>
|
||||
-#endif
|
||||
-
|
||||
-#ifdef __MINGW32__
|
||||
-#include <malloc.h>
|
||||
-#endif
|
||||
-
|
||||
NAMESPACE_BEGIN(CryptoPP)
|
||||
|
||||
#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
|
||||
diff --git embeddedcryptopp/secblock.h embeddedcryptopp/secblock.h
|
||||
index fb55014..6300e27 100644
|
||||
--- embeddedcryptopp/secblock.h
|
||||
+++ embeddedcryptopp/secblock.h
|
||||
@@ -9,8 +9,6 @@
|
||||
|
||||
#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)
|
||||
#include <malloc.h>
|
||||
-#else
|
||||
- #include <stdlib.h>
|
||||
#endif
|
||||
|
||||
NAMESPACE_BEGIN(CryptoPP)
|
||||
@@ -352,8 +350,11 @@ public:
|
||||
//! copy contents and size from another SecBlock
|
||||
void Assign(const SecBlock<T, A> &t)
|
||||
{
|
||||
- New(t.m_size);
|
||||
- memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, m_size*sizeof(T));
|
||||
+ if (this != &t)
|
||||
+ {
|
||||
+ New(t.m_size);
|
||||
+ memcpy_s(m_ptr, m_size*sizeof(T), t.m_ptr, m_size*sizeof(T));
|
||||
+ }
|
||||
}
|
||||
|
||||
SecBlock<T, A>& operator=(const SecBlock<T, A> &t)
|
||||
diff --git embeddedcryptopp/smartptr.h embeddedcryptopp/smartptr.h
|
||||
index 6b4040e..a0a727e 100644
|
||||
--- embeddedcryptopp/smartptr.h
|
||||
+++ embeddedcryptopp/smartptr.h
|
||||
@@ -9,8 +9,8 @@ NAMESPACE_BEGIN(CryptoPP)
|
||||
template <class T> class simple_ptr
|
||||
{
|
||||
public:
|
||||
- simple_ptr() : m_p(NULL) {}
|
||||
- ~simple_ptr() {delete m_p;}
|
||||
+ simple_ptr(T *p = NULL) : m_p(p) {}
|
||||
+ ~simple_ptr() {delete m_p; m_p = NULL;} // set m_p to NULL so double destruction (which might occur in Singleton) will be harmless
|
||||
T *m_p;
|
||||
};
|
||||
|
||||
diff --git embeddedcryptopp/stdcpp.h embeddedcryptopp/stdcpp.h
|
||||
index 9a468ab..234bf54 100644
|
||||
--- embeddedcryptopp/stdcpp.h
|
||||
+++ embeddedcryptopp/stdcpp.h
|
||||
@@ -4,24 +4,28 @@
|
||||
#include <stddef.h>
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <exception>
|
||||
#include <typeinfo>
|
||||
-
|
||||
-
|
||||
-#ifdef _MSC_VER
|
||||
-#include <string.h> // CodeWarrior doesn't have memory.h
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
-// re-disable this
|
||||
-#pragma warning(disable: 4231)
|
||||
+// for alloca
|
||||
+#ifdef __sun
|
||||
+#include <alloca.h>
|
||||
+#elif defined(__MINGW32__)
|
||||
+#include <malloc.h>
|
||||
#endif
|
||||
|
||||
-#if defined(_MSC_VER) && defined(_CRTAPI1)
|
||||
+#ifdef _MSC_VER
|
||||
+#pragma warning(disable: 4231) // re-disable this
|
||||
+#ifdef _CRTAPI1
|
||||
#define CRYPTOPP_MSVCRT6
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#endif
|
||||
@ -1,5 +1,14 @@
|
||||
--- embeddedcryptopp/secblock.h.orig 2013-11-02 21:05:08.220199000 +0000
|
||||
+++ embeddedcryptopp/secblock.h
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <assert.h>
|
||||
|
||||
#if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)
|
||||
- #include <malloc.h>
|
||||
+ #include <stdlib.h>
|
||||
#endif
|
||||
|
||||
NAMESPACE_BEGIN(CryptoPP)
|
||||
@@ -94,7 +94,7 @@ public:
|
||||
|
||||
pointer allocate(size_type n, const void * = NULL)
|
||||
|
||||
18
security/py-pycryptopp/files/patch-setup.py
Normal file
18
security/py-pycryptopp/files/patch-setup.py
Normal file
@ -0,0 +1,18 @@
|
||||
--- setup.py~
|
||||
+++ setup.py
|
||||
@@ -138,12 +138,13 @@
|
||||
# Mac OS-X 10.6 is too old.
|
||||
|
||||
try:
|
||||
- sp = subprocess.Popen(['as', '-v'], stdin=subprocess.PIPE,
|
||||
+ sp = subprocess.Popen((os.getenv('CXX') or 'c++').split(' ') + (os.getenv('CXXFLAGS') or '').split(' ') + ['-xc', '-c', '-', '-o', '/dev/null', '-Wa,-v'], stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
|
||||
universal_newlines=True)
|
||||
sp.stdin.close()
|
||||
sp.wait()
|
||||
+ as_version=sp.stderr.read()
|
||||
- if re.search("GNU assembler version (0|1|2.0)", sp.stderr.read()):
|
||||
+ if not re.search("GNU assembler", as_version) or re.search("version (0|1|2.0)", as_version):
|
||||
define_macros.append(('CRYPTOPP_DISABLE_ASM', 1))
|
||||
except EnvironmentError:
|
||||
# Okay, nevermind. Maybe there isn't even an 'as' executable on this
|
||||
Loading…
Reference in New Issue
Block a user