Skip to content
Snippets Groups Projects
Commit 3c4a8c43 authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

'More warning fixes for pycrypto.' (AtlasPyFwdBwdPorts-00-03-14) 

	* Tagging AtlasPyFwdBwdPorts-00-03-14.
	* More warning fixes for pycrypto.

2016-12-20  scott snyder  <snyder@bnl.gov>

	* Tagging AtlasPyFwdBwdPorts-00-03-13.
	* Fix another compilation warning in pycrypto.

2016-12-16  scott snyder  <snyder@bnl.gov>

	* Tagging AtlasPyFwdBwdPorts-00-03-12.
	* Add patch to fix compilation warning in pycrypto that nicos is
	flagging.

2016-11-28 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Disabled the build of nesteddict. As apparently it tries to download
	  setuptools from a web address that doesn't exist anymore.
	* If we want to re-enable this python package, we need to add the
	  build of setuptools to this package explicitly.
...
(Long ChangeLog diff - truncated)


Former-commit-id: 06198ff6
parent 1d7c0225
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
External/AtlasPyFwdBwdPorts/CMakeLists.txt
+ 35
− 7
View file @ 3c4a8c43
# $Id: CMakeLists.txt 739538 2016-04-11 23:15:41Z ssnyder $
# $Id: CMakeLists.txt 790212 2016-12-16 17:43:15Z ssnyder $
# The name of the package:
atlas_subdir( AtlasPyFwdBwdPorts )
......@@ -10,7 +10,7 @@ endif()
# Helper macro for building and installing the packages. Documentation
# to be written later...
function( _setup_python_package name file )
function( _setup_python_package name file md5 )
# Parse the optional argument(s):
cmake_parse_arguments( ARG "SINGLE_VERSION" ""
......@@ -31,6 +31,7 @@ function( _setup_python_package name file )
ExternalProject_Add( ${name}
PREFIX ${CMAKE_BINARY_DIR}
URL ${file}
URL_MD5 ${md5}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo
"Configuring the build of ${name}"
......@@ -78,120 +79,143 @@ endfunction( _setup_python_package )
# Install Beaker:
_setup_python_package( Beaker
${CMAKE_CURRENT_SOURCE_DIR}/src/Beaker-1.5.4.tar.gz
de84e7511119dc0b8eb4ac177d3e2512
DEPENDS distribute )
# Install abc:
_setup_python_package( abc
${CMAKE_CURRENT_SOURCE_DIR}/src/abc-2.6.1.0.tar.gz
a0851484aa93cb8eac113fbaf1238414
SINGLE_VERSION )
# Install affinity:
_setup_python_package( affinity
${CMAKE_CURRENT_SOURCE_DIR}/src/affinity-0.1.0.tar.gz
cc610cdb05ca675b4089ce2f05796f57
DEPENDS distribute )
# Install argparse:
_setup_python_package( argparse
${CMAKE_CURRENT_SOURCE_DIR}/src/argparse-1.2.1.tar.gz
2fbef8cb61e506c706957ab6e135840c
DEPENDS distribute )
# Install bunch:
_setup_python_package( bunch
${CMAKE_CURRENT_SOURCE_DIR}/src/bunch-1.0.0.tar.gz
944d2e8f222ed032961daa34c5b5151c
DEPENDS distribute )
# Install datadiff:
_setup_python_package( datadiff
${CMAKE_CURRENT_SOURCE_DIR}/src/datadiff-1.1.1.tar.gz
48a2e9b85332b8252c8401205ff02756
DEPENDS distribute )
# Install distribute:
_setup_python_package( distribute
${CMAKE_CURRENT_SOURCE_DIR}/src/distribute-0.6.25.tar.gz )
${CMAKE_CURRENT_SOURCE_DIR}/src/distribute-0.6.25.tar.gz
a690874b9964d958a3200485eb827b1d )
# Install extensions:
_setup_python_package( extensions
${CMAKE_CURRENT_SOURCE_DIR}/src/extensions-0.4.tar.gz
e498fe6da146aefb677c3e8a210fbb29
SINGLE_VERSION )
# Install futures:
_setup_python_package( futures
${CMAKE_CURRENT_SOURCE_DIR}/src/futures-2.1.2.tar.gz
a6fa247e3c5fe3d60d8e12f1b873cc88
DEPENDS distribute )
# Install grin:
_setup_python_package( grin
${CMAKE_CURRENT_SOURCE_DIR}/src/grin-1.2.1.tar.gz
d894426dfbf70bc105388c2a51348199
DEPENDS argparse )
# Install hgsvn:
_setup_python_package( hgsvn
${CMAKE_CURRENT_SOURCE_DIR}/src/hgsvn-0.1.9.tar.gz
901f2fb04faad5a1e7cf84abfad564fd
DEPENDS distribute )
# Install iterutils:
_setup_python_package( iterutils
${CMAKE_CURRENT_SOURCE_DIR}/src/iterutils-0.1.6.tar.gz
e293044ec65d757ce075ac170ad9ada8
DEPENDS distribute
SINGLE_VERSION )
# Install jsonpickle:
_setup_python_package( jsonpickle
${CMAKE_CURRENT_SOURCE_DIR}/src/jsonpickle-0.4.0.tar.gz
63916228294218ca6e53fd1b16b626fa
DEPENDS simplejson
SINGLE_VERSION )
# Install keyring:
_setup_python_package( keyring
${CMAKE_CURRENT_SOURCE_DIR}/src/keyring-0.5.1.tar.gz
a2f0dcea7185580c163ef2db1f4fbe0c
DEPENDS distribute
SINGLE_VERSION )
# Install mercurial:
_setup_python_package( mercurial
${CMAKE_CURRENT_SOURCE_DIR}/src/mercurial-2.1.2.tar.gz
15354d739504ec46f68a0fee2ecfbf25
SINGLE_VERSION )
# Install nested_dict:
_setup_python_package( nested_dict
${CMAKE_CURRENT_SOURCE_DIR}/src/nested_dict-1.0.9.tar.gz )
#_setup_python_package( nested_dict
# ${CMAKE_CURRENT_SOURCE_DIR}/src/nested_dict-1.0.9.tar.gz
# aeb571306af08142d11fee99ff569019 )
# Install ordereddict:
_setup_python_package( ordereddict
${CMAKE_CURRENT_SOURCE_DIR}/src/ordereddict-1.1.tar.gz
7ff95dba551c563ad04ba7076b16607f
SINGLE_VERSION )
# Install paramiko:
_setup_python_package( paramiko
${CMAKE_CURRENT_SOURCE_DIR}/src/paramiko-1.7.6.tar.gz
fa144ab46f1dc639b05ab948c30efac4
DEPENDS pycrypto )
# Install pip:
_setup_python_package( pip
${CMAKE_CURRENT_SOURCE_DIR}/src/pip-1.1.tar.gz
62a9f08dd5dc69d76734568a6c040508
DEPENDS distribute )
# Install pycrypto:
_setup_python_package( pycrypto
${CMAKE_CURRENT_SOURCE_DIR}/src/pycrypto-2.1.0.tar.gz
${CMAKE_CURRENT_SOURCE_DIR}/src/pycrypto-2.6.1.tar.gz
55a61a054aa66812daf5161a0d5d7eda
DEPENDS distribute
PATCH ${CMAKE_CURRENT_SOURCE_DIR}/src/pycrypto.patch
PATCH ${CMAKE_CURRENT_SOURCE_DIR}/src/pycrypto-warning.patch
SINGLE_VERSION )
# Install pyflakes:
_setup_python_package( pyflakes
${CMAKE_CURRENT_SOURCE_DIR}/src/pyflakes-1.1.0.tar.gz
e0bf854cd5abd4527e149692925b82eb
SINGLE_VERSION )
# Install pyinotify:
_setup_python_package( pyinotify
${CMAKE_CURRENT_SOURCE_DIR}/src/pyinotify-0.9.1.tar.gz
bd06a9feac312414e57d92c781bda539
DEPENDS distribute
SINGLE_VERSION )
# Install pyyaml:
_setup_python_package( pyyaml
${CMAKE_CURRENT_SOURCE_DIR}/src/pyyaml-3.10.tar.gz
45e5b429265d7815699be439adc8b37e
DEPENDS distribute
EXTRA_ARGS --without-libyaml
SINGLE_VERSION )
......@@ -199,17 +223,21 @@ _setup_python_package( pyyaml
# Install ruffus:
_setup_python_package( ruffus
${CMAKE_CURRENT_SOURCE_DIR}/src/ruffus-2.2.tar.gz
d96fc1b90ad58367f04538e7c9b07c95
DEPENDS simplejson )
# Install simplejson:
_setup_python_package( simplejson
${CMAKE_CURRENT_SOURCE_DIR}/src/simplejson-2.1.6.tar.gz
2f8351f6e6fe7ef25744805dfa56c0d5
DEPENDS distribute )
# Install virtualenv:
_setup_python_package( virtualenv
${CMAKE_CURRENT_SOURCE_DIR}/src/virtualenv-1.6.4.tar.gz
1072b66d53c24e019a8f1304ac9d9fc5
DEPENDS pip )
# Clean up:
unset( _setup_python_package )
External/AtlasPyFwdBwdPorts/cmt/pkgbuild_pycrypto.py
+ 1
− 1
View file @ 3c4a8c43
......@@ -6,7 +6,7 @@ import os
import sys
pkg_name= "pycrypto"
pkg_ver = "2.1.0"
pkg_ver = "2.6.1"
dist_configure = configure
def configure(self):
......
External/AtlasPyFwdBwdPorts/cmt/requirements
+ 5
− 5
View file @ 3c4a8c43
......@@ -62,10 +62,10 @@ apply_pattern make_pkgbuild \
file=pkgbuild_ordereddict.py
macro_append make_pkgbuild_ordereddict_dependencies " make_pkgbuild_collections "
apply_pattern make_pkgbuild \
name=nested_dict \
file=pkgbuild_nested_dict.py
macro_append make_pkgbuild_ordereddict_dependencies " make_pkgbuild_collections "
#apply_pattern make_pkgbuild \
# name=nested_dict \
# file=pkgbuild_nested_dict.py
#macro_append make_pkgbuild_ordereddict_dependencies " make_pkgbuild_collections "
apply_pattern make_pkgbuild \
name=bunch \
......@@ -186,7 +186,6 @@ apply_pattern make_pkgbuild \
file=pkgbuild_paramiko.py
macro_append make_pkgbuild_paramiko_dependencies " make_pkgbuild_pycrypto "
apply_pattern make_pkgbuild \
name=beaker \
file=pkgbuild_beaker.py
......@@ -225,3 +224,4 @@ private
## for ATN tests
use TestPolicy TestPolicy-*
end_private
External/AtlasPyFwdBwdPorts/src/pycrypto-warning.patch 0 → 100644
+ 52
− 0
View file @ 3c4a8c43
--- pycrypto/src/MD2.c-orig 2016-12-16 18:24:43.000000001 +0100
+++ pycrypto/src/MD2.c 2016-12-16 18:25:33.000000001 +0100
@@ -41,10 +41,12 @@
* digestAlgorithm(2) 2
* }
*/
+#if 0
static const char md2_oid[] = { 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x02 };
#define DER_OID ((void*)&md2_oid)
#define DER_OID_SIZE (sizeof md2_oid)
+#endif
typedef unsigned char U8;
typedef unsigned int U32;
--- pycrypto-2.6.1/src/hash_SHA2_template.c-orig 2016-12-20 22:57:35.000000001 +0100
+++ pycrypto-2.6.1/src/hash_SHA2_template.c 2016-12-20 22:59:35.000000001 +0100
@@ -94,8 +94,10 @@
if (overflow_detector > hs->length_lower) {
overflow_detector = hs->length_upper;
hs->length_upper++;
- if (hs->length_upper > hs->length_upper)
- return 0;
+ // Obviously wrong. But the return value of this function isn't
+ // actually used anyway, so just get rid of this.
+ //if (hs->length_upper > hs->length_upper)
+ // return 0;
}
return 1;
}
--- pycrypto-2.6.1/src/_counter.c-orig 2016-12-23 17:42:20.000000001 +0100
+++ pycrypto-2.6.1/src/_counter.c 2016-12-23 17:43:30.000000001 +0100
@@ -576,7 +576,7 @@
if (m == NULL)
return;
- my_CounterLEType.ob_type = &PyType_Type;
+ my_CounterLEType.ob_type = &PyType_Type;
my_CounterBEType.ob_type = &PyType_Type;
#endif
}
--- pycrypto-2.6.1/src/strxor.c-orig 2016-12-23 17:42:26.000000001 +0100
+++ pycrypto-2.6.1/src/strxor.c 2016-12-23 17:43:02.000000001 +0100
@@ -28,7 +28,7 @@
#include "pycrypto_compat.h"
-static const char rcsid[] = "$Id$";
+//static const char rcsid[] = "$Id$";
/*
* xor_strings - XOR two strings together to produce a third string
External/AtlasPyFwdBwdPorts/src/pycrypto.patch deleted 100644 → 0
+ 0
− 106
View file @ 1d7c0225
--- pycrypto/src/MD2.c-orig 2016-04-11 22:50:07.000000001 +0200
+++ pycrypto/src/MD2.c 2016-04-11 22:50:27.000000001 +0200
@@ -27,8 +27,8 @@
*/
-#include <string.h>
#include "Python.h"
+#include <string.h>
#define MODULE_NAME MD2
#define DIGEST_SIZE 16
--- pycrypto/src/AES.c-orig 2016-04-12 00:46:36.000000001 +0200
+++ pycrypto/src/AES.c 2016-04-12 00:46:44.000000001 +0200
@@ -24,9 +24,9 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "Python.h"
#include <assert.h>
#include <stdlib.h>
-#include "Python.h"
#define MODULE_NAME AES
#define BLOCK_SIZE 16
--- pycrypto/src/ARC2.c-orig 2016-04-12 00:46:58.000000001 +0200
+++ pycrypto/src/ARC2.c 2016-04-12 00:47:04.000000001 +0200
@@ -41,8 +41,8 @@
*
*/
-#include <string.h>
#include "Python.h"
+#include <string.h>
#define MODULE_NAME ARC2
#define BLOCK_SIZE 8
--- pycrypto/src/Blowfish.c-orig 2016-04-12 00:47:21.000000001 +0200
+++ pycrypto/src/Blowfish.c 2016-04-12 00:47:29.000000001 +0200
@@ -26,10 +26,10 @@
* http://www.schneier.com/paper-blowfish-fse.html
*/
+#include "Python.h"
#include <assert.h>
#include <stdint.h>
#include <string.h>
-#include "Python.h"
#include "Blowfish-tables.h"
--- pycrypto/src/DES.c-orig 2016-04-12 00:47:51.000000001 +0200
+++ pycrypto/src/DES.c 2016-04-12 00:48:09.000000001 +0200
@@ -24,6 +24,8 @@
* Country of origin: Canada
*/
+#include "Python.h"
+
/* Setting this will cause LibTomCrypt to return CRYPT_INVALID_ARG when its
* assert-like LTC_ARGCHK macro fails. */
#define ARGTYPE 4
@@ -34,7 +36,6 @@
#undef DES /* this is needed because tomcrypt_custom.h defines DES to an empty string */
#include <assert.h>
-#include "Python.h"
typedef struct {
symmetric_key sk;
--- pycrypto/src/MD4.c-orig 2016-04-12 00:45:14.000000001 +0200
+++ pycrypto/src/MD4.c 2016-04-12 00:45:49.000000001 +0200
@@ -27,8 +27,8 @@
*/
-#include <string.h>
#include <Python.h>
+#include <string.h>
#define MODULE_NAME MD4
#define DIGEST_SIZE 16
--- pycrypto/src/RIPEMD160.c-orig 2016-04-12 00:46:13.000000001 +0200
+++ pycrypto/src/RIPEMD160.c 2016-04-12 00:46:16.000000001 +0200
@@ -43,10 +43,10 @@
* "RIPEMD-160 is big-bit-endian, little-byte-endian, and left-justified."
*/
+#include "Python.h"
#include <assert.h>
#include <stdint.h>
#include <string.h>
-#include "Python.h"
#define RIPEMD160_DIGEST_SIZE 20
--- pycrypto/src/_counter.c-orig 2016-04-12 00:48:40.000000001 +0200
+++ pycrypto/src/_counter.c 2016-04-12 00:48:46.000000001 +0200
@@ -22,6 +22,7 @@
* ===================================================================
*/
+#include "Python.h"
#include <assert.h>
#include <stddef.h>
#include <string.h>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment