diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:11 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:57 +0100 |
| commit | d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch) | |
| tree | f36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-support/beecrypt | |
| parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
| download | poky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz | |
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/beecrypt')
4 files changed, 128 insertions, 0 deletions
diff --git a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch new file mode 100644 index 0000000000..3e18a87c3f --- /dev/null +++ b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | We are unable to run code at configure time in a cross environemnt, but as we | ||
| 2 | control the build we can be fairly certain this dependency is met. | ||
| 3 | |||
| 4 | JL 05/07/10 | ||
| 5 | Index: beecrypt-4.1.2/configure.ac | ||
| 6 | =================================================================== | ||
| 7 | --- beecrypt-4.1.2.orig/configure.ac 2004-12-21 11:37:56.000000000 +0000 | ||
| 8 | +++ beecrypt-4.1.2/configure.ac 2010-07-05 16:09:50.390083494 +0100 | ||
| 9 | @@ -243,32 +243,6 @@ | ||
| 10 | # Predefines and checks for C++ API support | ||
| 11 | AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code]) | ||
| 12 | |||
| 13 | -if test "$ac_with_cplusplus" = yes; then | ||
| 14 | - AC_MSG_CHECKING([for IBM's ICU library version >= 2.8]) | ||
| 15 | - AC_LANG_PUSH(C) | ||
| 16 | - AC_RUN_IFELSE([ | ||
| 17 | - AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[ | ||
| 18 | - #if U_ICU_VERSION_MAJOR_NUM < 2 | ||
| 19 | - exit(1); | ||
| 20 | - #elif U_ICU_VERSION_MAJOR_NUM == 2 | ||
| 21 | - # if U_ICU_VERSION_MINOR_NUM < 8 | ||
| 22 | - exit(1); | ||
| 23 | - # else | ||
| 24 | - exit(0); | ||
| 25 | - # endif | ||
| 26 | - #else | ||
| 27 | - exit(0); | ||
| 28 | - #endif | ||
| 29 | - ]])],[ | ||
| 30 | - AC_MSG_RESULT([yes]) | ||
| 31 | - ],[ | ||
| 32 | - AC_MSG_RESULT([no]) | ||
| 33 | - AC_MSG_WARN([disabling cplusplus]) | ||
| 34 | - ac_with_cplusplus=no | ||
| 35 | - ]) | ||
| 36 | - AC_LANG_POP(C) | ||
| 37 | -fi | ||
| 38 | - | ||
| 39 | if test "$ac_with_cplusplus" = yes ; then | ||
| 40 | AC_DEFINE([CPPGLUE],1) | ||
| 41 | fi | ||
diff --git a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch new file mode 100644 index 0000000000..6103562e0a --- /dev/null +++ b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | Fix visibility of various C++ functions, inspired by a similar patch in the Fink | ||
| 2 | project: | ||
| 3 | http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html | ||
| 4 | |||
| 5 | JL 05/07/10 | ||
| 6 | Index: beecrypt-4.1.2/c++/security/Security.h | ||
| 7 | =================================================================== | ||
| 8 | --- beecrypt-4.1.2.orig/c++/security/Security.h 2010-07-05 17:15:34.811273306 +0100 | ||
| 9 | +++ beecrypt-4.1.2/c++/security/Security.h 2010-07-05 17:15:38.696388531 +0100 | ||
| 10 | @@ -75,8 +75,6 @@ | ||
| 11 | public: | ||
| 12 | typedef vector<const Provider*> provider_vector; | ||
| 13 | typedef provider_vector::iterator provider_vector_iterator; | ||
| 14 | - | ||
| 15 | - private: | ||
| 16 | struct spi | ||
| 17 | { | ||
| 18 | Object* cspi; | ||
| 19 | @@ -91,6 +89,7 @@ | ||
| 20 | static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException); | ||
| 21 | static spi* getFirstSpi(const String& type); | ||
| 22 | |||
| 23 | + private: | ||
| 24 | static const String& getKeyStoreDefault(); | ||
| 25 | |||
| 26 | static bool _init; | ||
| 27 | Index: beecrypt-4.1.2/c++/beeyond/BeeCertificate.h | ||
| 28 | =================================================================== | ||
| 29 | --- beecrypt-4.1.2.orig/c++/beeyond/BeeCertificate.h 2004-11-03 09:37:27.000000000 +0000 | ||
| 30 | +++ beecrypt-4.1.2/c++/beeyond/BeeCertificate.h 2010-07-05 17:16:25.216332324 +0100 | ||
| 31 | @@ -150,11 +150,11 @@ | ||
| 32 | mutable String* str; | ||
| 33 | |||
| 34 | BeeCertificate(); | ||
| 35 | - BeeCertificate(InputStream& in) throw (IOException); | ||
| 36 | |||
| 37 | bytearray* encodeTBS() const; | ||
| 38 | |||
| 39 | public: | ||
| 40 | + BeeCertificate(InputStream& in) throw (IOException); | ||
| 41 | BeeCertificate(const BeeCertificate&); | ||
| 42 | virtual ~BeeCertificate(); | ||
| 43 | |||
diff --git a/meta/recipes-support/beecrypt/beecrypt/x64fix.patch b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch new file mode 100644 index 0000000000..ac02425d51 --- /dev/null +++ b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | Don't have 64 appended to the libdir for 64bit platforms. | ||
| 2 | |||
| 3 | JL 05/07/10 | ||
| 4 | Index: beecrypt-4.1.2/configure.ac | ||
| 5 | =================================================================== | ||
| 6 | --- beecrypt-4.1.2.orig/configure.ac 2010-07-05 16:39:43.000000000 +0100 | ||
| 7 | +++ beecrypt-4.1.2/configure.ac 2010-07-05 16:40:27.521082866 +0100 | ||
| 8 | @@ -585,15 +585,6 @@ | ||
| 9 | |||
| 10 | # Check where to install the libraries | ||
| 11 | bc_libalt= | ||
| 12 | -case $target_os in | ||
| 13 | -linux*) | ||
| 14 | - case $bc_target_arch in | ||
| 15 | - powerpc64 | s390x | x86_64) | ||
| 16 | - bc_libalt="64" | ||
| 17 | - ;; | ||
| 18 | - esac | ||
| 19 | - ;; | ||
| 20 | -esac | ||
| 21 | AC_SUBST(LIBALT,$bc_libalt) | ||
| 22 | |||
| 23 | # Generate output files. | ||
diff --git a/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb b/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb new file mode 100644 index 0000000000..6eb40e5d5d --- /dev/null +++ b/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | # Beecrypt OE build file | ||
| 2 | # Copyright (C) 2004-2005, Advanced Micro Devices, Inc. All Rights Reserved | ||
| 3 | # Released under the MIT license (see packages/COPYING) | ||
| 4 | |||
| 5 | DESCRIPTION="Beecrypt is a general-purpose cryptography library." | ||
| 6 | HOMEPAGE="http://sourceforge.net/projects/beecrypt" | ||
| 7 | SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \ | ||
| 8 | file://x64fix.patch \ | ||
| 9 | file://disable-icu-check.patch \ | ||
| 10 | file://fix-security.patch" | ||
| 11 | |||
| 12 | DEPENDS = "icu" | ||
| 13 | |||
| 14 | PR = "r0" | ||
| 15 | |||
| 16 | inherit autotools | ||
| 17 | acpaths="" | ||
| 18 | |||
| 19 | EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static" | ||
| 20 | |||
| 21 | BBCLASSEXTEND = "native" | ||
