mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
beecrypt: remove
This was only in oe-core for RPM5, but RPM4 doesn't use it. (From OE-Core rev: fb8ca4225f3e26bfc46cf6c06d55df72684c47c6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
committed by
Richard Purdie
Richard Purdie
parent
1b0340b3b8
commit
c5e230aba9
@@ -65,7 +65,6 @@ RECIPE_MAINTAINER_pn-bash = "Hongxu Jia <hongxu.jia@windriver.com>"
|
|||||||
RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin <alexander.kanavin@intel.com>"
|
RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin <alexander.kanavin@intel.com>"
|
||||||
RECIPE_MAINTAINER_pn-bc = "Jose Lamego <jose.a.lamego@linux.intel.com>"
|
RECIPE_MAINTAINER_pn-bc = "Jose Lamego <jose.a.lamego@linux.intel.com>"
|
||||||
RECIPE_MAINTAINER_pn-bdwgc = "Alexander Kanavin <alexander.kanavin@intel.com>"
|
RECIPE_MAINTAINER_pn-bdwgc = "Alexander Kanavin <alexander.kanavin@intel.com>"
|
||||||
RECIPE_MAINTAINER_pn-beecrypt = "Armin Kuster <akuster808@gmail.com>"
|
|
||||||
RECIPE_MAINTAINER_pn-bind = "Armin Kuster <akuster808@gmail.com>"
|
RECIPE_MAINTAINER_pn-bind = "Armin Kuster <akuster808@gmail.com>"
|
||||||
RECIPE_MAINTAINER_pn-binutils = "Khem Raj <raj.khem@gmail.com>"
|
RECIPE_MAINTAINER_pn-binutils = "Khem Raj <raj.khem@gmail.com>"
|
||||||
RECIPE_MAINTAINER_pn-binutils-cross = "Khem Raj <raj.khem@gmail.com>"
|
RECIPE_MAINTAINER_pn-binutils-cross = "Khem Raj <raj.khem@gmail.com>"
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
Add config option --with-dev-dsp.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
|
|
||||||
---
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -106,6 +106,16 @@ AC_ARG_WITH(python,[ --with-python[[=AR
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
+AC_ARG_WITH(dev-dsp,[ --with-dev-dsp enables dev/dsp for entropy producing. auto for auto-detecting dev/dep on host. [[default=no]]],[
|
|
||||||
+ if test "$withval" = yes; then
|
|
||||||
+ AC_DEFINE([HAVE_DEV_DSP], 1)
|
|
||||||
+ else
|
|
||||||
+ if test "$withval" = auto; then
|
|
||||||
+ ac_detect_dev_dsp=yes
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
+ ],[ac_detect_dev_dsp=no])
|
|
||||||
+
|
|
||||||
# Check for expert mode
|
|
||||||
if test "$ac_enable_expert_mode" = yes; then
|
|
||||||
BEE_EXPERT_MODE
|
|
||||||
@@ -464,7 +474,7 @@ linux*)
|
|
||||||
ac_cv_have_dev_dsp=no
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
- if test "$ac_cv_have_dev_dsp" = yes; then
|
|
||||||
+ if test "$ac_cv_have_dev_dsp" = yes && test "$ac_detect_dev_dsp" = yes; then
|
|
||||||
AC_DEFINE([HAVE_DEV_DSP], 1)
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
beecrypt: enable ptest support
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [embedded specific]
|
|
||||||
|
|
||||||
Add install-ptest rules.
|
|
||||||
|
|
||||||
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
|
||||||
---
|
|
||||||
Makefile.am | 3 +++
|
|
||||||
tests/Makefile.am | 3 +++
|
|
||||||
2 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
|
||||||
index b7e7869..5076f59 100644
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -73,3 +73,6 @@ DISTCLEANFILES = mpopt.s blowfishopt.s sha1opt.s
|
|
||||||
|
|
||||||
bench:
|
|
||||||
(cd tests && $(MAKE) $(AM_MAKEFLAGS) bench)
|
|
||||||
+
|
|
||||||
+install-ptest:
|
|
||||||
+ (cd tests && $(MAKE) $(AM_MAKEFLAGS) check_PROGRAMS)
|
|
||||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
||||||
index 1604e5e..d8db8d8 100644
|
|
||||||
--- a/tests/Makefile.am
|
|
||||||
+++ b/tests/Makefile.am
|
|
||||||
@@ -101,3 +101,6 @@ bench: benchme benchrsa benchhf benchbc
|
|
||||||
./benchbc AES 128
|
|
||||||
./benchbc Blowfish 128
|
|
||||||
./benchbc Blowfish 128
|
|
||||||
+
|
|
||||||
+check_PROGRAMS:
|
|
||||||
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
|
|
||||||
--
|
|
||||||
1.8.1.2
|
|
||||||
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
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.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [embedded specific]
|
|
||||||
|
|
||||||
JL 05/07/10
|
|
||||||
Index: beecrypt-4.2.1/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- beecrypt-4.2.1.orig/configure.ac 2010-11-26 17:12:25.000000000 +0800
|
|
||||||
+++ beecrypt-4.2.1/configure.ac 2010-11-26 17:12:30.000000000 +0800
|
|
||||||
@@ -292,32 +292,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
|
|
||||||
-
|
|
||||||
AM_CONDITIONAL([WITH_CPLUSPLUS],[test "$ac_with_cplusplus" = yes])
|
|
||||||
|
|
||||||
if test "$ac_with_cplusplus" = yes ; then
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
|
|
||||||
gcc-4.7 seems to be stricter about some things, so follow
|
|
||||||
the suggestion from the error/note information.
|
|
||||||
|
|
||||||
../../x86_64-linux-libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../..
|
|
||||||
x86_64-linux-libtool: compile: g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include -isyst
|
|
||||||
In file included from ../../include/beecrypt/c++/util/Hashtable.h:42:0,
|
|
||||||
from ../../include/beecrypt/c++/util/Properties.h:36,
|
|
||||||
from Properties.cxx:25:
|
|
||||||
../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::uti
|
|
||||||
Properties.cxx:228:1: required from here
|
|
||||||
../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not decl
|
|
||||||
../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent b
|
|
||||||
../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' ins
|
|
||||||
../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::uti
|
|
||||||
Properties.cxx:228:1: required from here
|
|
||||||
../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not decl
|
|
||||||
../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent b
|
|
||||||
../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' ins
|
|
||||||
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
|
||||||
|
|
||||||
|
|
||||||
Index: beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h
|
|
||||||
===================================================================
|
|
||||||
--- beecrypt-4.2.1.orig/include/beecrypt/c++/util/AbstractSet.h
|
|
||||||
+++ beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h
|
|
||||||
@@ -56,7 +56,7 @@ namespace beecrypt {
|
|
||||||
if (c->size() != size())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
- return containsAll(*c);
|
|
||||||
+ return this->containsAll(*c);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h
|
|
||||||
===================================================================
|
|
||||||
--- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:22:57.000000000 +0800
|
|
||||||
+++ beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:23:01.000000000 +0800
|
|
||||||
@@ -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:
|
|
||||||
+ BeeCertificate(InputStream& in) throw (IOException);
|
|
||||||
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:
|
|
||||||
struct spi
|
|
||||||
{
|
|
||||||
Object* cspi;
|
|
||||||
@@ -76,6 +75,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;
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
cd tests
|
|
||||||
for i in `ls`; do ./$i; if [ $? -eq 0 ]; then echo "PASS: $i"; \
|
|
||||||
else echo "FAIL: $i"; fi; done
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
# Beecrypt OE build file
|
|
||||||
# Copyright (C) 2004-2005, Advanced Micro Devices, Inc. All Rights Reserved
|
|
||||||
# Released under the MIT license (see packages/COPYING)
|
|
||||||
|
|
||||||
SUMMARY = "A general-purpose cryptography library"
|
|
||||||
HOMEPAGE = "http://sourceforge.net/projects/beecrypt"
|
|
||||||
|
|
||||||
SRC_URI = "${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
|
|
||||||
file://disable-icu-check.patch \
|
|
||||||
file://fix-security.patch \
|
|
||||||
file://fix-for-gcc-4.7.patch \
|
|
||||||
file://run-ptest \
|
|
||||||
file://beecrypt-enable-ptest-support.patch \
|
|
||||||
file://add-option-dev-dsp.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "8441c014170823f2dff97e33df55af1e"
|
|
||||||
SRC_URI[sha256sum] = "286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
|
|
||||||
|
|
||||||
LICENSE = "GPLv2 & LGPLv2.1"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
|
|
||||||
file://COPYING.LIB;md5=dcf3c825659e82539645da41a7908589 \
|
|
||||||
file://include/beecrypt/beecrypt.h;endline=20;md5=47a93eef539aac237eef86297a4d71c1"
|
|
||||||
|
|
||||||
PR = "r3"
|
|
||||||
|
|
||||||
inherit autotools multilib_header ptest
|
|
||||||
acpaths=""
|
|
||||||
|
|
||||||
do_install_append() {
|
|
||||||
oe_multilib_header beecrypt/gnu.h
|
|
||||||
}
|
|
||||||
|
|
||||||
EXTRA_OECONF = "--without-python --enable-shared --enable-static --disable-openmp --with-java=no"
|
|
||||||
|
|
||||||
PACKAGECONFIG ??= ""
|
|
||||||
PACKAGECONFIG[cplusplus] = "--with-cplusplus,--without-cplusplus,icu"
|
|
||||||
|
|
||||||
FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*"
|
|
||||||
FILES_${PN}-dev += "${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la"
|
|
||||||
FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a"
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "native nativesdk"
|
|
||||||
|
|
||||||
do_install_ptest () {
|
|
||||||
mkdir ${D}${PTEST_PATH}/tests
|
|
||||||
cp -r ${B}/tests/.libs/test* ${D}${PTEST_PATH}/tests
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user