summaryrefslogtreecommitdiffstats
path: root/meta/packages/beecrypt
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-07-05 15:38:23 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-24 00:46:57 +0100
commit60fa21d157823b9c6ffd4a066d3afdd2f0224d17 (patch)
tree6caafe15c592623713017d845cc767f83a466c0f /meta/packages/beecrypt
parent9fcba301febcfce937b3d0890d4ba3b43369fcd6 (diff)
downloadpoky-60fa21d157823b9c6ffd4a066d3afdd2f0224d17.tar.gz
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>
Diffstat (limited to 'meta/packages/beecrypt')
-rw-r--r--meta/packages/beecrypt/beecrypt/disable-icu-check.patch41
-rw-r--r--meta/packages/beecrypt/beecrypt/fix-security.patch43
-rw-r--r--meta/packages/beecrypt/beecrypt/x64fix.patch13
-rw-r--r--meta/packages/beecrypt/beecrypt_4.1.2.bb (renamed from meta/packages/beecrypt/beecrypt_3.1.0.bb)10
4 files changed, 99 insertions, 8 deletions
diff --git a/meta/packages/beecrypt/beecrypt/disable-icu-check.patch b/meta/packages/beecrypt/beecrypt/disable-icu-check.patch
new file mode 100644
index 0000000000..3e18a87c3f
--- /dev/null
+++ b/meta/packages/beecrypt/beecrypt/disable-icu-check.patch
@@ -0,0 +1,41 @@
1We are unable to run code at configure time in a cross environemnt, but as we
2control the build we can be fairly certain this dependency is met.
3
4JL 05/07/10
5Index: 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/packages/beecrypt/beecrypt/fix-security.patch b/meta/packages/beecrypt/beecrypt/fix-security.patch
new file mode 100644
index 0000000000..6103562e0a
--- /dev/null
+++ b/meta/packages/beecrypt/beecrypt/fix-security.patch
@@ -0,0 +1,43 @@
1Fix visibility of various C++ functions, inspired by a similar patch in the Fink
2project:
3http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html
4
5JL 05/07/10
6Index: 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;
27Index: 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/packages/beecrypt/beecrypt/x64fix.patch b/meta/packages/beecrypt/beecrypt/x64fix.patch
index 9ee75c1404..ac02425d51 100644
--- a/meta/packages/beecrypt/beecrypt/x64fix.patch
+++ b/meta/packages/beecrypt/beecrypt/x64fix.patch
@@ -1,15 +1,18 @@
1Index: beecrypt-3.1.0/configure.ac 1Don't have 64 appended to the libdir for 64bit platforms.
2
3JL 05/07/10
4Index: beecrypt-4.1.2/configure.ac
2=================================================================== 5===================================================================
3--- beecrypt-3.1.0.orig/configure.ac 2008-08-16 12:08:02.000000000 +0100 6--- beecrypt-4.1.2.orig/configure.ac 2010-07-05 16:39:43.000000000 +0100
4+++ beecrypt-3.1.0/configure.ac 2008-08-16 12:08:26.000000000 +0100 7+++ beecrypt-4.1.2/configure.ac 2010-07-05 16:40:27.521082866 +0100
5@@ -754,15 +754,6 @@ 8@@ -585,15 +585,6 @@
6 9
7 # Check where to install the libraries 10 # Check where to install the libraries
8 bc_libalt= 11 bc_libalt=
9-case $target_os in 12-case $target_os in
10-linux*) 13-linux*)
11- case $bc_target_arch in 14- case $bc_target_arch in
12- alpha* | powerpc64 | s390x | x86_64) 15- powerpc64 | s390x | x86_64)
13- bc_libalt="64" 16- bc_libalt="64"
14- ;; 17- ;;
15- esac 18- esac
diff --git a/meta/packages/beecrypt/beecrypt_3.1.0.bb b/meta/packages/beecrypt/beecrypt_4.1.2.bb
index 2b2b46138a..6eb40e5d5d 100644
--- a/meta/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/meta/packages/beecrypt/beecrypt_4.1.2.bb
@@ -5,13 +5,17 @@
5DESCRIPTION="Beecrypt is a general-purpose cryptography library." 5DESCRIPTION="Beecrypt is a general-purpose cryptography library."
6HOMEPAGE="http://sourceforge.net/projects/beecrypt" 6HOMEPAGE="http://sourceforge.net/projects/beecrypt"
7SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \ 7SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
8 file://x64fix.patch;patch=1" 8 file://x64fix.patch \
9 file://disable-icu-check.patch \
10 file://fix-security.patch"
9 11
10PR = "r1" 12DEPENDS = "icu"
13
14PR = "r0"
11 15
12inherit autotools 16inherit autotools
13acpaths="" 17acpaths=""
14 18
15EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static" 19EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static"
16 20
17BBCLASSEXTEND = "native" 21BBCLASSEXTEND = "native"