summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/beecrypt
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/beecrypt')
-rw-r--r--meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch12
-rw-r--r--meta/recipes-support/beecrypt/beecrypt/fix-security.patch51
-rw-r--r--meta/recipes-support/beecrypt/beecrypt/x64fix.patch23
-rw-r--r--meta/recipes-support/beecrypt/beecrypt_4.2.1.bb (renamed from meta/recipes-support/beecrypt/beecrypt_4.1.2.bb)13
4 files changed, 39 insertions, 60 deletions
diff --git a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
index 3e18a87c3f..4a2f414778 100644
--- a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
@@ -2,11 +2,11 @@ We 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. 2control the build we can be fairly certain this dependency is met.
3 3
4JL 05/07/10 4JL 05/07/10
5Index: beecrypt-4.1.2/configure.ac 5Index: beecrypt-4.2.1/configure.ac
6=================================================================== 6===================================================================
7--- beecrypt-4.1.2.orig/configure.ac 2004-12-21 11:37:56.000000000 +0000 7--- beecrypt-4.2.1.orig/configure.ac 2010-11-26 17:12:25.000000000 +0800
8+++ beecrypt-4.1.2/configure.ac 2010-07-05 16:09:50.390083494 +0100 8+++ beecrypt-4.2.1/configure.ac 2010-11-26 17:12:30.000000000 +0800
9@@ -243,32 +243,6 @@ 9@@ -292,32 +292,6 @@
10 # Predefines and checks for C++ API support 10 # Predefines and checks for C++ API support
11 AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code]) 11 AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code])
12 12
@@ -36,6 +36,6 @@ Index: beecrypt-4.1.2/configure.ac
36- AC_LANG_POP(C) 36- AC_LANG_POP(C)
37-fi 37-fi
38- 38-
39 AM_CONDITIONAL([WITH_CPLUSPLUS],[test "$ac_with_cplusplus" = yes])
40
39 if test "$ac_with_cplusplus" = yes ; then 41 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
index 6103562e0a..f28e393ca7 100644
--- a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
@@ -3,20 +3,38 @@ project:
3http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html 3http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html
4 4
5JL 05/07/10 5JL 05/07/10
6Index: beecrypt-4.1.2/c++/security/Security.h 6Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h
7=================================================================== 7===================================================================
8--- beecrypt-4.1.2.orig/c++/security/Security.h 2010-07-05 17:15:34.811273306 +0100 8--- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:22:57.000000000 +0800
9+++ beecrypt-4.1.2/c++/security/Security.h 2010-07-05 17:15:38.696388531 +0100 9+++ beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:23:01.000000000 +0800
10@@ -75,8 +75,6 @@ 10@@ -147,13 +147,13 @@
11 mutable bytearray* enc;
12
13 BeeCertificate();
14- BeeCertificate(InputStream& in) throw (IOException);
15
16 void encodeTBS(DataOutputStream& out) const throw (IOException);
17
18 bytearray* encodeTBS() const throw (CertificateEncodingException);
19
11 public: 20 public:
12 typedef vector<const Provider*> provider_vector; 21+ BeeCertificate(InputStream& in) throw (IOException);
13 typedef provider_vector::iterator provider_vector_iterator; 22 BeeCertificate(const BeeCertificate&) throw (CloneNotSupportedException);
14- 23 virtual ~BeeCertificate();
24
25Index: beecrypt-4.2.1/include/beecrypt/c++/security/Security.h
26===================================================================
27--- beecrypt-4.2.1.orig/include/beecrypt/c++/security/Security.h 2010-11-26 17:20:55.000000000 +0800
28+++ beecrypt-4.2.1/include/beecrypt/c++/security/Security.h 2010-11-26 17:21:36.000000000 +0800
29@@ -61,7 +61,6 @@
30 friend class SecureRandom;
31 friend class Signature;
32
15- private: 33- private:
16 struct spi 34 struct spi
17 { 35 {
18 Object* cspi; 36 Object* cspi;
19@@ -91,6 +89,7 @@ 37@@ -76,6 +75,7 @@
20 static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException); 38 static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException);
21 static spi* getFirstSpi(const String& type); 39 static spi* getFirstSpi(const String& type);
22 40
@@ -24,20 +42,3 @@ Index: beecrypt-4.1.2/c++/security/Security.h
24 static const String& getKeyStoreDefault(); 42 static const String& getKeyStoreDefault();
25 43
26 static bool _init; 44 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/recipes-support/beecrypt/beecrypt/x64fix.patch b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
deleted file mode 100644
index ac02425d51..0000000000
--- a/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Don't have 64 appended to the libdir for 64bit platforms.
2
3JL 05/07/10
4Index: 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.2.1.bb
index e381a6bfa9..d4c7972167 100644
--- a/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
@@ -5,15 +5,16 @@
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 \
9 file://disable-icu-check.patch \ 8 file://disable-icu-check.patch \
10 file://fix-security.patch" 9 file://fix-security.patch"
11 10
12SRC_URI[md5sum] = "820d26437843ab0a6a8a5151a73a657c" 11SRC_URI[md5sum] = "8441c014170823f2dff97e33df55af1e"
13SRC_URI[sha256sum] = "f29eb246947677a9e7870521e3d576fd0d91a7072210a4404ed137e40cfc18fd" 12SRC_URI[sha256sum] = "286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
14LICENSE = "GPLv2&LGPLv2.1" 13LICENSE = "GPLv2 & LGPLv2.1"
15LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \ 14LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
16 file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589" 15 file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \
16 file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1"
17
17DEPENDS = "icu" 18DEPENDS = "icu"
18 19
19PR = "r0" 20PR = "r0"
@@ -21,6 +22,6 @@ PR = "r0"
21inherit autotools 22inherit autotools
22acpaths="" 23acpaths=""
23 24
24EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static" 25EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp"
25 26
26BBCLASSEXTEND = "native" 27BBCLASSEXTEND = "native"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 10:23:52 +0000