diff options
author | Pacho Ramos <pacho@gentoo.org> | 2011-07-26 18:22:28 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2011-07-26 18:22:28 +0000 |
commit | 4e5b5f859d601679e4f2d569eb1d6347402fab92 (patch) | |
tree | 650d7cd2bdcdb2572ce713207f7d243568d36500 /dev-libs/beecrypt/files | |
parent | Introduce branding useflag, yay gentoo screen and about, Thanx to Ian Whyman ... (diff) | |
download | historical-4e5b5f859d601679e4f2d569eb1d6347402fab92.tar.gz historical-4e5b5f859d601679e4f2d569eb1d6347402fab92.tar.bz2 historical-4e5b5f859d601679e4f2d569eb1d6347402fab92.zip |
This needs python2 (bug #312153 and #362497 by Arfrever and Vadim), remove old.
Package-Manager: portage-2.1.10.7/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/beecrypt/files')
6 files changed, 0 insertions, 324 deletions
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-base64.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-base64.patch deleted file mode 100644 index c6c370bd0788..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.1.2-base64.patch +++ /dev/null @@ -1,11 +0,0 @@ -Fix b64encode() for data starting with NUL from Miloslav Trmac <mitr@redhat.com> ---- beecrypt-4.1.2/base64.c.b64 2005-04-26 21:46:27.000000000 +0200 -+++ beecrypt-4.1.2/base64.c 2005-04-26 21:47:48.000000000 +0200 -@@ -253,7 +253,6 @@ - unsigned c; - - if (s == NULL) return NULL; -- if (*s == '\0') return calloc(1, sizeof(*t)); - - if (ns == 0) ns = strlen((const char*) s); - nt = ((ns + 2) / 3) * 4; diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-build.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-build.patch deleted file mode 100644 index ea34a7d4f7e0..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.1.2-build.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff -urNp beecrypt-4.1.2.org/acinclude.m4 beecrypt-4.1.2/acinclude.m4 ---- beecrypt-4.1.2.org/acinclude.m4 2004-12-19 22:16:35.000000000 +0200 -+++ beecrypt-4.1.2/acinclude.m4 2006-10-24 22:23:27.000000000 +0200 -@@ -16,7 +16,7 @@ AC_DEFUN([BEECRYPT_WITH_CPU],[ - i[[3456]]86) - case $withval in - i[[3456]]86 | \ -- pentium | pentium-mmx | pentiumpro | pentium[[234]] | \ -+ pentium | pentium-m | pentium-mmx | pentiumpro | pentium[[234]] | \ - athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp) - ;; - *) -@@ -80,9 +80,10 @@ AC_DEFUN([BEECRYPT_WITH_ARCH],[ - case $target_cpu in - i[[3456]]86) - case $withval in -+ em64t | \ - i[[3456]]86 | \ -- pentium | pentium-mmx | pentiumpro | pentium[[234]] | \ -- athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp) -+ pentium | pentium-m | pentium-mmx | pentiumpro | pentium[[234]] | \ -+ athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp | athlon64 | k8) - if test "$ac_with_cpu" != yes; then - bc_target_cpu=$withval - fi -@@ -906,7 +907,7 @@ AC_DEFUN([BEECRYPT_NOEXECSTACK],[ - # convert conftest.c to conftest.s - $CCAS $CFLAGS -S conftest.c - # use egrep to find GNU-stack in in the output assembler -- bc_gnu_stack=`$EGREP -e '\.section[[:space:]]+\.note\.GNU-stack' conftest.s` -+ bc_gnu_stack=`$EGREP -e '\.section.*GNU-stack' conftest.s` - ],[ - CFLAGS=$CFLAGS_save - CXXFLAGS=$CXXFLAGS_save -@@ -1126,6 +1127,11 @@ AC_DEFUN([BEECRYPT_ASM_SOURCES],[ - m4 $srcdir/gas/mpopt.alpha.m4 > mpopt.s - ]) - ;; -+ x86_64 | athlon64 | athlon-fx | em64t | k8) -+ AC_CONFIG_COMMANDS([mpopt.x86_64],[ -+ m4 $srcdir/gas/mpopt.x86_64.m4 > mpopt.s -+ ]) -+ ;; - athlon* | i[[3456]]86 | pentium*) - AC_CONFIG_COMMANDS([aesopt.x86],[ - m4 $srcdir/gas/aesopt.x86.m4 > aesopt.s -@@ -1175,15 +1181,12 @@ AC_DEFUN([BEECRYPT_ASM_SOURCES],[ - m4 $srcdir/gas/mpopt.sparcv8plus.m4 > mpopt.s - ]) - ;; -- x86_64) -- AC_CONFIG_COMMANDS([mpopt.x86_64],[ -- m4 $srcdir/gas/mpopt.x86_64.m4 > mpopt.s -- ]) -- ;; - esac - if test "$ac_with_arch" = yes; then - # Code is i586-specific! - case $bc_target_arch in -+ x86_64 | athlon64 | athlon-fx | em64t | k8) -+ ;; - athlon* | i[[56]]86 | pentium*) - AC_CONFIG_COMMANDS([blowfishopt.i586],[ - m4 $srcdir/gas/blowfishopt.i586.m4 > blowfishopt.s -diff -urNp beecrypt-4.1.2.org/configure.ac beecrypt-4.1.2/configure.ac ---- beecrypt-4.1.2.org/configure.ac 2004-12-21 13:37:56.000000000 +0200 -+++ beecrypt-4.1.2/configure.ac 2006-10-24 22:18:01.000000000 +0200 -@@ -501,9 +501,11 @@ if test "$ac_enable_debug" != yes; then - arm*) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM" - ;; -+ x86_64 | athlon64 | athlon-fx | em64t | k8) -+ CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64" -+ ;; - athlon*) -- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX" -- CFLAGS="$CFLAGS -mmmx" -+ CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX" - ;; - i386) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386" -@@ -526,24 +528,23 @@ if test "$ac_enable_debug" != yes; then - pentium) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586" - ;; -+ pentium-m) -+ CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2" -+ ;; - pentium-mmx) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586 -DOPTIMIZE_MMX" -- CFLAGS="$CFLAGS -mmmx" - ;; - pentiumpro) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686" - ;; - pentium2) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX" -- CFLAGS="$CFLAGS -mmmx" - ;; - pentium3) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE" -- CFLAGS="$CFLAGS -msse" - ;; - pentium4) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2" -- CFLAGS="$CFLAGS -msse2" - ;; - powerpc) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC" -@@ -556,15 +557,12 @@ if test "$ac_enable_debug" != yes; then - ;; - sparcv8) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8" -- CFLAGS="$CFLAGS -Wa,-xarch=v8" - ;; - sparcv8plus*) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8PLUS" -- CFLAGS="$CFLAGS -Wa,-xarch=v8plus" - ;; - sparcv9*) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9" -- CFLAGS="$CFLAGS -Wa,-xarch=v9" - ;; - x86_64) - CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64" -@@ -612,7 +612,7 @@ - case $target_os in - linux*) - case $bc_target_arch in -- powerpc64 | s390x | x86_64) -+ powerpc64 | s390x | x86_64 | athlon64 | athlon-fx | em64t | k8) - bc_libalt="64" - ;; - esac - -diff -urNp beecrypt-4.1.2.org/gas/x86.m4 beecrypt-4.1.2/gas/x86.m4 ---- beecrypt-4.1.2.org/gas/x86.m4 2004-06-13 14:37:28.000000000 +0300 -+++ beecrypt-4.1.2/gas/x86.m4 2006-10-24 22:18:01.000000000 +0200 -@@ -48,3 +48,25 @@ define(USE_MMX) - define(USE_SSE) - define(USE_SSE2) - ') -+ifelse(ASM_ARCH,pentium-m,` -+undefine(`ALIGN') -+define(ALIGN,`.p2align 4') -+define(USE_MMX) -+define(USE_SSE) -+define(USE_SSE2) -+') -+ifelse(ASM_ARCH,athlon64,` -+undefine(`USE_MMX') -+') -+ifelse(ASM_ARCH,x86_64,` -+undefine(`USE_MMX') -+') -+ifelse(ASM_ARCH,athlon-fx,` -+undefine(`USE_MMX') -+') -+ifelse(ASM_ARCH,em64t,` -+undefine(`USE_MMX') -+') -+ifelse(ASM_ARCH,k8,` -+undefine(`USE_MMX') -+') diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-gcc4.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-gcc4.patch deleted file mode 100644 index 69cdac07b2cf..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.1.2-gcc4.patch +++ /dev/null @@ -1,40 +0,0 @@ -fixes from upstream - -http://bugs.gentoo.org/150579 - ---- beecrypt/c++/security/Security.h -+++ beecrypt/c++/security/Security.h -@@ -59,16 +59,16 @@ - { - friend class AlgorithmParameterGenerator; - friend class AlgorithmParameters; -- friend class CertificateFactory; -- friend class CertPathValidator; -- friend class Cipher; -- friend class KeyAgreement; -+ friend class ::CertificateFactory; -+ friend class ::CertPathValidator; -+ friend class ::Cipher; -+ friend class ::KeyAgreement; - friend class KeyFactory; - friend class KeyPairGenerator; - friend class KeyStore; -- friend class Mac; -+ friend class ::Mac; - friend class MessageDigest; -- friend class SecretKeyFactory; -+ friend class ::SecretKeyFactory; - friend class SecureRandom; - friend class Signature; - ---- beecrypt/c++/beeyond/BeeCertificate.h -+++ beecrypt/c++/beeyond/BeeCertificate.h -@@ -61,7 +61,7 @@ - */ - class BEECRYPTCXXAPI BeeCertificate : public beecrypt::security::cert::Certificate, public beecrypt::lang::Cloneable - { -- friend class BeeCertificateFactory; -+ friend class ::BeeCertificateFactory; - - public: - static const Date FOREVER; diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-python-Makefile-am.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-python-Makefile-am.patch deleted file mode 100644 index c78982afbaf6..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.1.2-python-Makefile-am.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- beecrypt-4.1.2/python/test/Makefile.am 2004-07-19 08:07:59.000000000 +0200 -+++ beecrypt-cvs/python/test/Makefile.am 2006-05-06 15:04:17.000000000 +0200 -@@ -11,4 +11,4 @@ - all: - - check: -- $(VALGRIND) PYTHONPATH=.. python test_all.py verbose -+ $(VALGRIND) PYTHONPATH="..:../.libs" python test_all.py verbose diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-python-debug-py-c.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-python-debug-py-c.patch deleted file mode 100644 index 7bb0e7886a0b..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.1.2-python-debug-py-c.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- beecrypt-4.1.2/python/debug-py.c 2004-06-20 13:09:21.000000000 +0200 -+++ beecrypt-cvs/python/debug-py.c 2005-06-16 09:38:01.000000000 +0200 -@@ -1,10 +1,5 @@ -- --/*@unchecked@*/ --extern PyTypeObject PyCode_Type; --/*@unchecked@*/ --extern PyTypeObject PyDictIter_Type; --/*@unchecked@*/ --extern PyTypeObject PyFrame_Type; -+#include "compile.h" -+#include "frameobject.h" - - #include "beecrypt/python/mpw-py.h" /* XXX debug only */ - #include "beecrypt/python/rng-py.h" /* XXX debug only */ -@@ -33,7 +28,6 @@ - if (o->ob_type == &PyCode_Type) return "Code"; - if (o->ob_type == &PyComplex_Type) return "Complex"; - if (o->ob_type == &PyDict_Type) return "Dict"; -- if (o->ob_type == &PyDictIter_Type) return "DictIter"; - if (o->ob_type == &PyFile_Type) return "File"; - if (o->ob_type == &PyFloat_Type) return "Float"; - if (o->ob_type == &PyFrame_Type) return "Frame"; diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch deleted file mode 100644 index d47cac4ca3a0..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -urNp beecrypt-4.1.2.org/c++/mutex.h beecrypt-4.1.2/c++/mutex.h ---- beecrypt-4.1.2.org/c++/mutex.h 2004-09-07 13:47:51.000000000 +0300 -+++ beecrypt-4.1.2/c++/mutex.h 2006-10-23 11:19:04.000000000 +0200 -@@ -37,7 +37,9 @@ namespace beecrypt { - class BEECRYPTCXXAPI mutex - { - private: -+#ifdef ENABLE_THREADS - bc_mutex_t _lock; -+#endif - - public: - inline void init() throw (char*) -@@ -55,7 +57,9 @@ namespace beecrypt { - if ((rc = pthread_mutex_init(&_lock, 0))) - throw strerror(rc); - # else -+ # ifdef ENABLE_THREADS - # error -+ # endif - # endif - #endif - } -@@ -75,7 +79,9 @@ namespace beecrypt { - if ((rc = pthread_mutex_lock(&_lock))) - throw strerror(rc); - # else -+ # ifdef ENABLE_THREADS - # error -+ # endif - # endif - #endif - } -@@ -107,7 +113,9 @@ namespace beecrypt { - return false; - throw strerror(rc); - # else -+ # ifdef ENABLE_THREADS - # error -+ # endif - # endif - #endif - } -@@ -126,7 +134,9 @@ namespace beecrypt { - if ((rc = pthread_mutex_unlock(&_lock))) - throw strerror(rc); - # else -+ # ifdef ENABLE_THREADS - # error -+ # endif - # endif - #endif - } -@@ -145,7 +155,9 @@ namespace beecrypt { - if ((rc = pthread_mutex_destroy(&_lock))) - throw strerror(rc); - # else -+ # ifdef ENABLE_THREADS - # error -+ # endif - # endif - #endif - } -diff -urNp beecrypt-4.1.2.org/c++/security/Security.cxx beecrypt-4.1.2/c++/security/Security.cxx ---- beecrypt-4.1.2.org/c++/security/Security.cxx 2004-11-02 09:06:58.000000000 +0200 -+++ beecrypt-4.1.2/c++/security/Security.cxx 2006-10-23 11:19:23.000000000 +0200 -@@ -115,10 +115,8 @@ void Security::initialize() - { - #if WIN32 - const Provider& (*inst)(void*) = (const Provider& (*)(void*)) GetProcAddress((HMODULE) handle, "provider_const_ref"); -- #elif HAVE_PTHREAD_H -- const Provider& (*inst)(void*) = (const Provider& (*)(void*)) dlsym(handle, "provider_const_ref"); - #else -- # error -+ const Provider& (*inst)(void*) = (const Provider& (*)(void*)) dlsym(handle, "provider_const_ref"); - #endif - - if (inst) |