mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

beecrypt: Update to 4.2.1

Browse Source 
Rebased disable-icu-check.patch & fix-security.patch. Removed x64fix.patch as
it is already in upstream. Also some configure changes: removing "--with-arch"
as it can't cowork with expert mode, adding "--disable-openmp" to avoid
unnecessary dependency.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
This commit is contained in:
Zhai Edwin
2010-11-26 16:57:55 +08:00
committed by Richard Purdie
parent 21fafc889e
commit b0783ec2fd
4 changed files with 39 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
+6 -6
View File
@@ -2,11 +2,11 @@ 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. control the build we can be fairly certain this dependency is met.
JL 05/07/10 JL 05/07/10
Index: beecrypt-4.1.2/configure.ac Index: beecrypt-4.2.1/configure.ac
=================================================================== ===================================================================
--- beecrypt-4.1.2.orig/configure.ac 2004-12-21 11:37:56.000000000 +0000 --- beecrypt-4.2.1.orig/configure.ac 2010-11-26 17:12:25.000000000 +0800
+++ beecrypt-4.1.2/configure.ac 2010-07-05 16:09:50.390083494 +0100 +++ beecrypt-4.2.1/configure.ac 2010-11-26 17:12:30.000000000 +0800
@@ -243,32 +243,6 @@ @@ -292,32 +292,6 @@
# Predefines and checks for C++ API support # Predefines and checks for C++ API support
AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code]) AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code])
@@ -36,6 +36,6 @@ Index: beecrypt-4.1.2/configure.ac
- AC_LANG_POP(C) - AC_LANG_POP(C)
-fi -fi
- -
AM_CONDITIONAL([WITH_CPLUSPLUS],[test "$ac_with_cplusplus" = yes])
if test "$ac_with_cplusplus" = yes ; then if test "$ac_with_cplusplus" = yes ; then
AC_DEFINE([CPPGLUE],1)
fi
meta/recipes-support/beecrypt/beecrypt/fix-security.patch
+26 -25
View File
@@ -3,20 +3,38 @@ project:
http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html
JL 05/07/10 JL 05/07/10
Index: beecrypt-4.1.2/c++/security/Security.h Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h
=================================================================== ===================================================================
--- beecrypt-4.1.2.orig/c++/security/Security.h 2010-07-05 17:15:34.811273306 +0100 --- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:22:57.000000000 +0800
+++ beecrypt-4.1.2/c++/security/Security.h 2010-07-05 17:15:38.696388531 +0100 +++ beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:23:01.000000000 +0800
@@ -75,8 +75,6 @@ @@ -147,13 +147,13 @@
mutable bytearray* enc;
BeeCertificate();
- BeeCertificate(InputStream& in) throw (IOException);
void encodeTBS(DataOutputStream& out) const throw (IOException);
bytearray* encodeTBS() const throw (CertificateEncodingException);
public: public:
typedef vector<const Provider*> provider_vector; + BeeCertificate(InputStream& in) throw (IOException);
typedef provider_vector::iterator provider_vector_iterator; BeeCertificate(const BeeCertificate&) throw (CloneNotSupportedException);
- virtual ~BeeCertificate();
Index: beecrypt-4.2.1/include/beecrypt/c++/security/Security.h
===================================================================
--- beecrypt-4.2.1.orig/include/beecrypt/c++/security/Security.h 2010-11-26 17:20:55.000000000 +0800
+++ beecrypt-4.2.1/include/beecrypt/c++/security/Security.h 2010-11-26 17:21:36.000000000 +0800
@@ -61,7 +61,6 @@
friend class SecureRandom;
friend class Signature;
- private: - private:
struct spi struct spi
{ {
Object* cspi; Object* cspi;
@@ -91,6 +89,7 @@ @@ -76,6 +75,7 @@
static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException); static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException);
static spi* getFirstSpi(const String& type); static spi* getFirstSpi(const String& type);
@@ -24,20 +42,3 @@ Index: beecrypt-4.1.2/c++/security/Security.h
static const String& getKeyStoreDefault(); static const String& getKeyStoreDefault();
static bool _init; 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();
meta/recipes-support/beecrypt/beecrypt/x64fix.patch
-23
View File
@@ -1,23 +0,0 @@
Don't have 64 appended to the libdir for 64bit platforms.
JL 05/07/10
Index: beecrypt-4.1.2/configure.ac
===================================================================
--- 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
- powerpc64 | s390x | x86_64)
- bc_libalt="64"
- ;;
- esac
- ;;
-esac
AC_SUBST(LIBALT,$bc_libalt)
# Generate output files.
meta/recipes-support/beecrypt/beecrypt_4.1.2.bb → meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
+7 -6
View File
@@ -5,15 +5,16 @@
DESCRIPTION="Beecrypt is a general-purpose cryptography library." DESCRIPTION="Beecrypt is a general-purpose cryptography library."
HOMEPAGE="http://sourceforge.net/projects/beecrypt" HOMEPAGE="http://sourceforge.net/projects/beecrypt"
SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \ SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
file://x64fix.patch \
file://disable-icu-check.patch \ file://disable-icu-check.patch \
file://fix-security.patch" file://fix-security.patch"
SRC_URI[md5sum] = "820d26437843ab0a6a8a5151a73a657c" SRC_URI[md5sum] = "8441c014170823f2dff97e33df55af1e"
SRC_URI[sha256sum] = "f29eb246947677a9e7870521e3d576fd0d91a7072210a4404ed137e40cfc18fd" SRC_URI[sha256sum] = "286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
LICENSE = "GPLv2&LGPLv2.1" LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \ LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589" file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \
file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1"
DEPENDS = "icu" DEPENDS = "icu"
PR = "r0" PR = "r0"
@@ -21,6 +22,6 @@ PR = "r0"
inherit autotools inherit autotools
acpaths="" acpaths=""
EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static" EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"