beecrypt: upgrade to version 4.1.2

Add new patches to fix visiblity of C++ methods and to disable running a
program to detect the ICU version.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
This commit is contained in:
Joshua Lock 2010-07-05 15:38:23 +01:00 committed by Richard Purdie
parent 9fcba301fe
commit 60fa21d157
4 changed files with 99 additions and 8 deletions

View File

@ -0,0 +1,41 @@
We are unable to run code at configure time in a cross environemnt, but as we
control the build we can be fairly certain this dependency is met.
JL 05/07/10
Index: beecrypt-4.1.2/configure.ac
===================================================================
--- beecrypt-4.1.2.orig/configure.ac 2004-12-21 11:37:56.000000000 +0000
+++ beecrypt-4.1.2/configure.ac 2010-07-05 16:09:50.390083494 +0100
@@ -243,32 +243,6 @@
# Predefines and checks for C++ API support
AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code])
-if test "$ac_with_cplusplus" = yes; then
- AC_MSG_CHECKING([for IBM's ICU library version >= 2.8])
- AC_LANG_PUSH(C)
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[
- #if U_ICU_VERSION_MAJOR_NUM < 2
- exit(1);
- #elif U_ICU_VERSION_MAJOR_NUM == 2
- # if U_ICU_VERSION_MINOR_NUM < 8
- exit(1);
- # else
- exit(0);
- # endif
- #else
- exit(0);
- #endif
- ]])],[
- AC_MSG_RESULT([yes])
- ],[
- AC_MSG_RESULT([no])
- AC_MSG_WARN([disabling cplusplus])
- ac_with_cplusplus=no
- ])
- AC_LANG_POP(C)
-fi
-
if test "$ac_with_cplusplus" = yes ; then
AC_DEFINE([CPPGLUE],1)
fi

View File

@ -0,0 +1,43 @@
Fix visibility of various C++ functions, inspired by a similar patch in the Fink
project:
http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html
JL 05/07/10
Index: beecrypt-4.1.2/c++/security/Security.h
===================================================================
--- beecrypt-4.1.2.orig/c++/security/Security.h 2010-07-05 17:15:34.811273306 +0100
+++ beecrypt-4.1.2/c++/security/Security.h 2010-07-05 17:15:38.696388531 +0100
@@ -75,8 +75,6 @@
public:
typedef vector<const Provider*> provider_vector;
typedef provider_vector::iterator provider_vector_iterator;
-
- private:
struct spi
{
Object* cspi;
@@ -91,6 +89,7 @@
static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException);
static spi* getFirstSpi(const String& type);
+ private:
static const String& getKeyStoreDefault();
static bool _init;
Index: beecrypt-4.1.2/c++/beeyond/BeeCertificate.h
===================================================================
--- beecrypt-4.1.2.orig/c++/beeyond/BeeCertificate.h 2004-11-03 09:37:27.000000000 +0000
+++ beecrypt-4.1.2/c++/beeyond/BeeCertificate.h 2010-07-05 17:16:25.216332324 +0100
@@ -150,11 +150,11 @@
mutable String* str;
BeeCertificate();
- BeeCertificate(InputStream& in) throw (IOException);
bytearray* encodeTBS() const;
public:
+ BeeCertificate(InputStream& in) throw (IOException);
BeeCertificate(const BeeCertificate&);
virtual ~BeeCertificate();

View File

@ -1,15 +1,18 @@
Index: beecrypt-3.1.0/configure.ac
Don't have 64 appended to the libdir for 64bit platforms.
JL 05/07/10
Index: beecrypt-4.1.2/configure.ac
===================================================================
--- beecrypt-3.1.0.orig/configure.ac 2008-08-16 12:08:02.000000000 +0100
+++ beecrypt-3.1.0/configure.ac 2008-08-16 12:08:26.000000000 +0100
@@ -754,15 +754,6 @@
--- beecrypt-4.1.2.orig/configure.ac 2010-07-05 16:39:43.000000000 +0100
+++ beecrypt-4.1.2/configure.ac 2010-07-05 16:40:27.521082866 +0100
@@ -585,15 +585,6 @@
# Check where to install the libraries
bc_libalt=
-case $target_os in
-linux*)
- case $bc_target_arch in
- alpha* | powerpc64 | s390x | x86_64)
- powerpc64 | s390x | x86_64)
- bc_libalt="64"
- ;;
- esac

View File

@ -5,13 +5,17 @@
DESCRIPTION="Beecrypt is a general-purpose cryptography library."
HOMEPAGE="http://sourceforge.net/projects/beecrypt"
SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
file://x64fix.patch;patch=1"
file://x64fix.patch \
file://disable-icu-check.patch \
file://fix-security.patch"
PR = "r1"
DEPENDS = "icu"
PR = "r0"
inherit autotools
acpaths=""
EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static"
BBCLASSEXTEND = "native"