# ChangeLog for dev-libs/beecrypt
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.75 2011/04/03 17:52:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.76 2011/07/26 18:22:27 pacho Exp $
+
+ 26 Jul 2011; Pacho Ramos <pacho@gentoo.org> -beecrypt-4.1.2-r1.ebuild,
+ -beecrypt-4.1.2-r2.ebuild, -files/beecrypt-4.1.2-base64.patch,
+ -files/beecrypt-4.1.2-build.patch, -files/beecrypt-4.1.2-gcc4.patch,
+ -files/beecrypt-4.1.2-python-Makefile-am.patch,
+ -files/beecrypt-4.1.2-python-debug-py-c.patch,
+ -files/beecrypt-4.1.2-threads.patch, beecrypt-4.2.1.ebuild:
+ This needs python2 (bug #312153 and #362497 by Arfrever and Vadim), remove
+ old.
03 Apr 2011; Raúl Porcel <armin76@gentoo.org> beecrypt-4.2.1.ebuild:
ia64/s390/sh stable wrt #342387
-AUX beecrypt-4.1.2-base64.patch 414 RMD160 8990c65079b5623a1995b524beacd028a516f5f8 SHA1 095b6e17b972e00512c627ba9fd473e4acc7e546 SHA256 ba378900e17872ff3efb55e71a68e371b0f027c8b162b9e02a742fc4acd2fc3a
-AUX beecrypt-4.1.2-build.patch 5255 RMD160 3f66e4bcb8b86672f7479d3ea4fbb5cad3213bf6 SHA1 dba7a9e5fe0fbd9bc2c62579c63353d013db059f SHA256 b148f400ab405a0d33511220bf38f3ed0ea6f1f054af9227bae0504b1cbbbd93
-AUX beecrypt-4.1.2-gcc4.patch 1163 RMD160 f3af93f4491752afa870d29224e0ecda6b17622a SHA1 93a484a44cc6e9d8ae4ba3bbb774d04d9aaec0d2 SHA256 8fc8a2c652fdce419327e5bc176bc0abcc42d69588a136459cb915dc1950b4ad
-AUX beecrypt-4.1.2-python-Makefile-am.patch 311 RMD160 dd271f87a2cff9042007e69e1238513e8c4fffa0 SHA1 b7b262aa484925ef57ed1869c2a548c564810d96 SHA256 fba9950605602ae777c540c7a0c07d90547cb26edfa36df481c767be11d2c9b3
-AUX beecrypt-4.1.2-python-debug-py-c.patch 887 RMD160 414bc978cae368facdcb6fbaae9f80edd1c2ec16 SHA1 b53bed1526ffd3671955558461d5059ed9c912ed SHA256 4a31c4f7591334e9ea1dffc314f924e6379aed2818ce95c85e3f970054538c98
-AUX beecrypt-4.1.2-threads.patch 2142 RMD160 96b4dc0ebd5bc28228e063987987f3db2817621a SHA1 f3e252258a3d4e253df3735951ae3dfaff2f6132 SHA256 c8bdc84848ec24330fd3973fb84cef2eaaa1d8e845039dc5a0d0f6bc4c4345da
AUX beecrypt-4.2.1-build-system.patch 2188 RMD160 01c8b9d4da5ea403b5f4362c3247a9ad37f3a979 SHA1 32534fe1c13602876d2c85588b72b3781a339e03 SHA256 5cf1fc73482f20ca4e937a401c1fb2e93eddc29802dc3a62a2ebddb7bb1689dd
-DIST beecrypt-4.1.2.tar.gz 774280 RMD160 fe26e5429738450fa2ef00b37e9725eec29bda08 SHA1 71cebd3329bb2561ffba24a2004dfac50b143f59 SHA256 f29eb246947677a9e7870521e3d576fd0d91a7072210a4404ed137e40cfc18fd
DIST beecrypt-4.2.1.tar.gz 882758 RMD160 2602b07bdd28d8d4a352199eca3d17b771098d66 SHA1 b1c62c2480c79302a8ca5c09063b3d654275eae0 SHA256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d
-EBUILD beecrypt-4.1.2-r1.ebuild 2335 RMD160 0fc7c70d7d1483c47adbd7c0b9b98dc8b007db5b SHA1 adb4d2450237118193ec5efa01a3026a7ee4fe4f SHA256 49749775c7c547041b51f0fb135c84a273f41491ff2db7d1fd932cc2edd85c59
-EBUILD beecrypt-4.1.2-r2.ebuild 2660 RMD160 9acf1fd548c83012c2204ac11ecf1ec3e6e042d1 SHA1 0ce20acc7dcec1eacd2ad402e3976020cfb06906 SHA256 00f4c8ada5f0923e3eff070b79ad1234cc83b18f07dd1ec4317c5776f79a1bee
-EBUILD beecrypt-4.2.1.ebuild 1933 RMD160 1378e7da0968e7f4e12ca20ba39ccd32b9d2e9c1 SHA1 dee8091f79a07f48f3ab07616c370a0a298b3a82 SHA256 a3cee63f34ee99367ec3fa0f679c11cb5427d871752746fccf3c85f2c12b06ae
-MISC ChangeLog 11795 RMD160 bbd6b0889d4ae572ad3465990e70034dae67a57c SHA1 e7bade4ad8e45778d73422b08d9c39b9c608a55c SHA256 a0949a210f1ae39440ae261388a38b4743e9b6a81de892e4ed6527b079ce3bbf
+EBUILD beecrypt-4.2.1.ebuild 2039 RMD160 2c95f7573ab64ec3d75a6520c567622e82732a21 SHA1 597702680b119826609b1269c1d166bf42389a8f SHA256 14f2b930402bed431dae42f22b36405e8eb0f0408023211797386235653c345a
+MISC ChangeLog 12248 RMD160 41d1950b4f8b1831db3f8e331939d483bf1eea3c SHA1 c5a0e616b02ca7c867a04532c2332dc01ff1884a SHA256 cde503c0d4f48e4a4ed21e1ace4b1519975d1ae64b11544eb36643dde66363b4
MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.24 2010/12/14 02:12:00 mattst88 Exp $
-
-inherit flag-o-matic eutils multilib autotools java-pkg-opt-2
-
-DESCRIPTION="general-purpose cryptography library"
-HOMEPAGE="http://sourceforge.net/projects/beecrypt"
-SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="java nocxx python threads"
-
-COMMONDEPEND="python? ( >=dev-lang/python-2.2 )
- !<app-arch/rpm-4.2.1"
-
-DEPEND="${COMMONDEPEND}
- java? ( >=virtual/jdk-1.4 )"
-
-RDEPEND="${COMMONDEPEND}
- java? ( >=virtual/jre-1.4 )"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # Set correct python libdir on multilib systems
- sed -i -e 's:get_python_lib():get_python_lib(1,0):' \
- configure.ac || die "sed failed"
- # let configure figure out libpaths, not a pokey build system
- sed -i \
- -e '/^libaltdir=/s:=.*:=$(libdir):' \
- -e '/^pkgaltlibdir=/s:=.*:=$(libdir)/beecrypt:' \
- $(find . -name Makefile.am) || die
-
- # upstream patches from CVS
- epatch "${FILESDIR}/${P}-python-Makefile-am.patch"
- epatch "${FILESDIR}/${P}-python-debug-py-c.patch"
- epatch "${FILESDIR}/${P}-build.patch"
- epatch "${FILESDIR}/${P}-gcc4.patch"
- epatch "${FILESDIR}/${P}-threads.patch"
- eautoreconf
-}
-
-src_compile() {
- local myarch=$(get-flag march)
- [[ -z ${myarch} ]] && myarch=${CHOST%%-*}
- [[ ${myarch} == "athlon64" || ${myarch} == "k8" || ${myarch} == "opteron" || ${myarch} == "athlon-fx" ]] && \
- [[ ${CHOST%%-*} != "x86_64" ]] && myarch=${CHOST%%-*}
- replace-flags pentium4m pentium4
- econf \
- $(use_enable threads) \
- $(use_with !nocxx cplusplus) \
- $(use_with java) \
- $(use_with python) \
- --with-arch=${myarch} \
- --libdir=/usr/$(get_libdir) \
- || die
- emake || die "emake failed"
-}
-
-src_test() {
- export BEECRYPT_CONF_FILE=${T}/beecrypt-test.conf
- echo provider.1=${S}/c++/provider/.libs/base.so > ${BEECRYPT_CONF_FILE}
- make check || die "self test failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- # Not needed
- rm -f "${D}"/usr/$(get_libdir)/python*/site-packages/_bc.*a
- dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed"
-}
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild,v 1.10 2010/12/14 02:12:00 mattst88 Exp $
-
-inherit flag-o-matic eutils multilib autotools java-pkg-opt-2
-
-DESCRIPTION="general-purpose cryptography library"
-HOMEPAGE="http://sourceforge.net/projects/beecrypt"
-SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="java nocxx python threads doc"
-
-COMMONDEPEND="python? ( >=dev-lang/python-2.2 )
- !<app-arch/rpm-4.2.1"
-
-DEPEND="${COMMONDEPEND}
- java? ( >=virtual/jdk-1.4 )
- doc? ( app-doc/doxygen
- virtual/latex-base
- || ( dev-texlive/texlive-fontsextra app-text/ptex ) )"
-RDEPEND="${COMMONDEPEND}
- java? ( >=virtual/jre-1.4 )"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # Set correct python libdir on multilib systems
- sed -i -e 's:get_python_lib():get_python_lib(1,0):' \
- configure.ac || die "sed failed"
- # let configure figure out libpaths, not a pokey build system
- sed -i \
- -e '/^libaltdir=/s:=.*:=$(libdir):' \
- -e '/^pkgaltlibdir=/s:=.*:=$(libdir)/beecrypt:' \
- $(find . -name Makefile.am) || die
- epatch "${FILESDIR}"/${P}-python-Makefile-am.patch
- epatch "${FILESDIR}"/${P}-python-debug-py-c.patch
- epatch "${FILESDIR}"/${P}-build.patch
- epatch "${FILESDIR}"/${P}-gcc4.patch
- epatch "${FILESDIR}"/${P}-threads.patch
- epatch "${FILESDIR}"/${P}-base64.patch
- eautoreconf
-}
-
-src_compile() {
- local myarch=$(get-flag march)
- [[ -z ${myarch} ]] && myarch=${CHOST%%-*}
- [[ ${myarch} == "athlon64" || ${myarch} == "k8" || ${myarch} == "opteron" || ${myarch} == "athlon-fx" ]] && \
- [[ ${CHOST%%-*} != "x86_64" ]] && myarch=${CHOST%%-*}
- [[ ${myarch} == "native" ]] && myarch=${CHOST%%-*}
- replace-flags pentium4m pentium4
- econf \
- $(use_enable threads) \
- $(use_with !nocxx cplusplus) \
- $(use_with java) \
- $(use_with python) \
- --with-arch=${myarch} \
- --libdir=/usr/$(get_libdir) \
- || die
- emake || die "emake failed"
- use doc && doxygen
-}
-
-src_test() {
- export BEECRYPT_CONF_FILE=${T}/beecrypt-test.conf
- echo provider.1=${S}/c++/provider/.libs/base.so > ${BEECRYPT_CONF_FILE}
- make check || die "self test failed"
- make bench || die "self benchmark test failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- # Not needed
- rm -f "${D}"/usr/$(get_libdir)/python*/site-packages/_bc.*a
- dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed"
- if use doc ; then
- dohtml -r docs/html/. || die "dohtml failed"
- fi
-}
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.11 2011/04/03 17:52:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.12 2011/07/26 18:22:27 pacho Exp $
EAPI="3"
+PYTHON_DEPEND="python? 2"
-inherit eutils multilib autotools java-pkg-opt-2
+inherit eutils multilib autotools java-pkg-opt-2 python
DESCRIPTION="general-purpose cryptography library"
HOMEPAGE="http://sourceforge.net/projects/beecrypt/"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="java nocxx python threads doc"
-COMMONDEPEND="python? ( >=dev-lang/python-2.2 )
- !<app-arch/rpm-4.2.1
+COMMONDEPEND="!<app-arch/rpm-4.2.1
!nocxx? ( threads? ( >=dev-libs/icu-2.8 ) )"
DEPEND="${COMMONDEPEND}
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.4 )"
+pkg_setup() {
+ use python && python_set_active_version 2
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
+ use python && python_convert_shebangs -r 2 .
+
epatch "${FILESDIR}"/${P}-build-system.patch
eautoreconf
}
econf \
--disable-expert-mode \
$(use_enable threads) \
- $(use_with python python "${EPREFIX}"/usr/bin/python) \
+ $(use_with python python "${EPREFIX}"/usr/bin/python2) \
$(use threads && use_with !nocxx cplusplus || echo --without-cplusplus) \
$(use_with java)
}
src_test() {
export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf"
echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}"
- make check || die "self test failed"
- make bench || die "self benchmark test failed"
+ emake check || die "self test failed"
+ emake bench || die "self benchmark test failed"
}
src_install() {
+++ /dev/null
-Fix b64encode() for data starting with NUL from Miloslav Trmac <mitr@redhat.com>
---- beecrypt-4.1.2/base64.c.b64 2005-04-26 21:46:27.000000000 +0200
-+++ beecrypt-4.1.2/base64.c 2005-04-26 21:47:48.000000000 +0200
-@@ -253,7 +253,6 @@
- unsigned c;
-
- if (s == NULL) return NULL;
-- if (*s == '\0') return calloc(1, sizeof(*t));
-
- if (ns == 0) ns = strlen((const char*) s);
- nt = ((ns + 2) / 3) * 4;
+++ /dev/null
-diff -urNp beecrypt-4.1.2.org/acinclude.m4 beecrypt-4.1.2/acinclude.m4
---- beecrypt-4.1.2.org/acinclude.m4 2004-12-19 22:16:35.000000000 +0200
-+++ beecrypt-4.1.2/acinclude.m4 2006-10-24 22:23:27.000000000 +0200
-@@ -16,7 +16,7 @@ AC_DEFUN([BEECRYPT_WITH_CPU],[
- i[[3456]]86)
- case $withval in
- i[[3456]]86 | \
-- pentium | pentium-mmx | pentiumpro | pentium[[234]] | \
-+ pentium | pentium-m | pentium-mmx | pentiumpro | pentium[[234]] | \
- athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp)
- ;;
- *)
-@@ -80,9 +80,10 @@ AC_DEFUN([BEECRYPT_WITH_ARCH],[
- case $target_cpu in
- i[[3456]]86)
- case $withval in
-+ em64t | \
- i[[3456]]86 | \
-- pentium | pentium-mmx | pentiumpro | pentium[[234]] | \
-- athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp)
-+ pentium | pentium-m | pentium-mmx | pentiumpro | pentium[[234]] | \
-+ athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp | athlon64 | k8)
- if test "$ac_with_cpu" != yes; then
- bc_target_cpu=$withval
- fi
-@@ -906,7 +907,7 @@ AC_DEFUN([BEECRYPT_NOEXECSTACK],[
- # convert conftest.c to conftest.s
- $CCAS $CFLAGS -S conftest.c
- # use egrep to find GNU-stack in in the output assembler
-- bc_gnu_stack=`$EGREP -e '\.section[[:space:]]+\.note\.GNU-stack' conftest.s`
-+ bc_gnu_stack=`$EGREP -e '\.section.*GNU-stack' conftest.s`
- ],[
- CFLAGS=$CFLAGS_save
- CXXFLAGS=$CXXFLAGS_save
-@@ -1126,6 +1127,11 @@ AC_DEFUN([BEECRYPT_ASM_SOURCES],[
- m4 $srcdir/gas/mpopt.alpha.m4 > mpopt.s
- ])
- ;;
-+ x86_64 | athlon64 | athlon-fx | em64t | k8)
-+ AC_CONFIG_COMMANDS([mpopt.x86_64],[
-+ m4 $srcdir/gas/mpopt.x86_64.m4 > mpopt.s
-+ ])
-+ ;;
- athlon* | i[[3456]]86 | pentium*)
- AC_CONFIG_COMMANDS([aesopt.x86],[
- m4 $srcdir/gas/aesopt.x86.m4 > aesopt.s
-@@ -1175,15 +1181,12 @@ AC_DEFUN([BEECRYPT_ASM_SOURCES],[
- m4 $srcdir/gas/mpopt.sparcv8plus.m4 > mpopt.s
- ])
- ;;
-- x86_64)
-- AC_CONFIG_COMMANDS([mpopt.x86_64],[
-- m4 $srcdir/gas/mpopt.x86_64.m4 > mpopt.s
-- ])
-- ;;
- esac
- if test "$ac_with_arch" = yes; then
- # Code is i586-specific!
- case $bc_target_arch in
-+ x86_64 | athlon64 | athlon-fx | em64t | k8)
-+ ;;
- athlon* | i[[56]]86 | pentium*)
- AC_CONFIG_COMMANDS([blowfishopt.i586],[
- m4 $srcdir/gas/blowfishopt.i586.m4 > blowfishopt.s
-diff -urNp beecrypt-4.1.2.org/configure.ac beecrypt-4.1.2/configure.ac
---- beecrypt-4.1.2.org/configure.ac 2004-12-21 13:37:56.000000000 +0200
-+++ beecrypt-4.1.2/configure.ac 2006-10-24 22:18:01.000000000 +0200
-@@ -501,9 +501,11 @@ if test "$ac_enable_debug" != yes; then
- arm*)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
- ;;
-+ x86_64 | athlon64 | athlon-fx | em64t | k8)
-+ CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"
-+ ;;
- athlon*)
-- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
-- CFLAGS="$CFLAGS -mmmx"
-+ CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
- ;;
- i386)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
-@@ -526,24 +528,23 @@ if test "$ac_enable_debug" != yes; then
- pentium)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
- ;;
-+ pentium-m)
-+ CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
-+ ;;
- pentium-mmx)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586 -DOPTIMIZE_MMX"
-- CFLAGS="$CFLAGS -mmmx"
- ;;
- pentiumpro)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
- ;;
- pentium2)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
-- CFLAGS="$CFLAGS -mmmx"
- ;;
- pentium3)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE"
-- CFLAGS="$CFLAGS -msse"
- ;;
- pentium4)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
-- CFLAGS="$CFLAGS -msse2"
- ;;
- powerpc)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC"
-@@ -556,15 +557,12 @@ if test "$ac_enable_debug" != yes; then
- ;;
- sparcv8)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8"
-- CFLAGS="$CFLAGS -Wa,-xarch=v8"
- ;;
- sparcv8plus*)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8PLUS"
-- CFLAGS="$CFLAGS -Wa,-xarch=v8plus"
- ;;
- sparcv9*)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
-- CFLAGS="$CFLAGS -Wa,-xarch=v9"
- ;;
- x86_64)
- CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"
-@@ -612,7 +612,7 @@
- case $target_os in
- linux*)
- case $bc_target_arch in
-- powerpc64 | s390x | x86_64)
-+ powerpc64 | s390x | x86_64 | athlon64 | athlon-fx | em64t | k8)
- bc_libalt="64"
- ;;
- esac
-
-diff -urNp beecrypt-4.1.2.org/gas/x86.m4 beecrypt-4.1.2/gas/x86.m4
---- beecrypt-4.1.2.org/gas/x86.m4 2004-06-13 14:37:28.000000000 +0300
-+++ beecrypt-4.1.2/gas/x86.m4 2006-10-24 22:18:01.000000000 +0200
-@@ -48,3 +48,25 @@ define(USE_MMX)
- define(USE_SSE)
- define(USE_SSE2)
- ')
-+ifelse(ASM_ARCH,pentium-m,`
-+undefine(`ALIGN')
-+define(ALIGN,`.p2align 4')
-+define(USE_MMX)
-+define(USE_SSE)
-+define(USE_SSE2)
-+')
-+ifelse(ASM_ARCH,athlon64,`
-+undefine(`USE_MMX')
-+')
-+ifelse(ASM_ARCH,x86_64,`
-+undefine(`USE_MMX')
-+')
-+ifelse(ASM_ARCH,athlon-fx,`
-+undefine(`USE_MMX')
-+')
-+ifelse(ASM_ARCH,em64t,`
-+undefine(`USE_MMX')
-+')
-+ifelse(ASM_ARCH,k8,`
-+undefine(`USE_MMX')
-+')
+++ /dev/null
-fixes from upstream
-
-http://bugs.gentoo.org/150579
-
---- beecrypt/c++/security/Security.h
-+++ beecrypt/c++/security/Security.h
-@@ -59,16 +59,16 @@
- {
- friend class AlgorithmParameterGenerator;
- friend class AlgorithmParameters;
-- friend class CertificateFactory;
-- friend class CertPathValidator;
-- friend class Cipher;
-- friend class KeyAgreement;
-+ friend class ::CertificateFactory;
-+ friend class ::CertPathValidator;
-+ friend class ::Cipher;
-+ friend class ::KeyAgreement;
- friend class KeyFactory;
- friend class KeyPairGenerator;
- friend class KeyStore;
-- friend class Mac;
-+ friend class ::Mac;
- friend class MessageDigest;
-- friend class SecretKeyFactory;
-+ friend class ::SecretKeyFactory;
- friend class SecureRandom;
- friend class Signature;
-
---- beecrypt/c++/beeyond/BeeCertificate.h
-+++ beecrypt/c++/beeyond/BeeCertificate.h
-@@ -61,7 +61,7 @@
- */
- class BEECRYPTCXXAPI BeeCertificate : public beecrypt::security::cert::Certificate, public beecrypt::lang::Cloneable
- {
-- friend class BeeCertificateFactory;
-+ friend class ::BeeCertificateFactory;
-
- public:
- static const Date FOREVER;
+++ /dev/null
---- beecrypt-4.1.2/python/test/Makefile.am 2004-07-19 08:07:59.000000000 +0200
-+++ beecrypt-cvs/python/test/Makefile.am 2006-05-06 15:04:17.000000000 +0200
-@@ -11,4 +11,4 @@
- all:
-
- check:
-- $(VALGRIND) PYTHONPATH=.. python test_all.py verbose
-+ $(VALGRIND) PYTHONPATH="..:../.libs" python test_all.py verbose
+++ /dev/null
---- beecrypt-4.1.2/python/debug-py.c 2004-06-20 13:09:21.000000000 +0200
-+++ beecrypt-cvs/python/debug-py.c 2005-06-16 09:38:01.000000000 +0200
-@@ -1,10 +1,5 @@
--
--/*@unchecked@*/
--extern PyTypeObject PyCode_Type;
--/*@unchecked@*/
--extern PyTypeObject PyDictIter_Type;
--/*@unchecked@*/
--extern PyTypeObject PyFrame_Type;
-+#include "compile.h"
-+#include "frameobject.h"
-
- #include "beecrypt/python/mpw-py.h" /* XXX debug only */
- #include "beecrypt/python/rng-py.h" /* XXX debug only */
-@@ -33,7 +28,6 @@
- if (o->ob_type == &PyCode_Type) return "Code";
- if (o->ob_type == &PyComplex_Type) return "Complex";
- if (o->ob_type == &PyDict_Type) return "Dict";
-- if (o->ob_type == &PyDictIter_Type) return "DictIter";
- if (o->ob_type == &PyFile_Type) return "File";
- if (o->ob_type == &PyFloat_Type) return "Float";
- if (o->ob_type == &PyFrame_Type) return "Frame";
+++ /dev/null
-diff -urNp beecrypt-4.1.2.org/c++/mutex.h beecrypt-4.1.2/c++/mutex.h
---- beecrypt-4.1.2.org/c++/mutex.h 2004-09-07 13:47:51.000000000 +0300
-+++ beecrypt-4.1.2/c++/mutex.h 2006-10-23 11:19:04.000000000 +0200
-@@ -37,7 +37,9 @@ namespace beecrypt {
- class BEECRYPTCXXAPI mutex
- {
- private:
-+#ifdef ENABLE_THREADS
- bc_mutex_t _lock;
-+#endif
-
- public:
- inline void init() throw (char*)
-@@ -55,7 +57,9 @@ namespace beecrypt {
- if ((rc = pthread_mutex_init(&_lock, 0)))
- throw strerror(rc);
- # else
-+ # ifdef ENABLE_THREADS
- # error
-+ # endif
- # endif
- #endif
- }
-@@ -75,7 +79,9 @@ namespace beecrypt {
- if ((rc = pthread_mutex_lock(&_lock)))
- throw strerror(rc);
- # else
-+ # ifdef ENABLE_THREADS
- # error
-+ # endif
- # endif
- #endif
- }
-@@ -107,7 +113,9 @@ namespace beecrypt {
- return false;
- throw strerror(rc);
- # else
-+ # ifdef ENABLE_THREADS
- # error
-+ # endif
- # endif
- #endif
- }
-@@ -126,7 +134,9 @@ namespace beecrypt {
- if ((rc = pthread_mutex_unlock(&_lock)))
- throw strerror(rc);
- # else
-+ # ifdef ENABLE_THREADS
- # error
-+ # endif
- # endif
- #endif
- }
-@@ -145,7 +155,9 @@ namespace beecrypt {
- if ((rc = pthread_mutex_destroy(&_lock)))
- throw strerror(rc);
- # else
-+ # ifdef ENABLE_THREADS
- # error
-+ # endif
- # endif
- #endif
- }
-diff -urNp beecrypt-4.1.2.org/c++/security/Security.cxx beecrypt-4.1.2/c++/security/Security.cxx
---- beecrypt-4.1.2.org/c++/security/Security.cxx 2004-11-02 09:06:58.000000000 +0200
-+++ beecrypt-4.1.2/c++/security/Security.cxx 2006-10-23 11:19:23.000000000 +0200
-@@ -115,10 +115,8 @@ void Security::initialize()
- {
- #if WIN32
- const Provider& (*inst)(void*) = (const Provider& (*)(void*)) GetProcAddress((HMODULE) handle, "provider_const_ref");
-- #elif HAVE_PTHREAD_H
-- const Provider& (*inst)(void*) = (const Provider& (*)(void*)) dlsym(handle, "provider_const_ref");
- #else
-- # error
-+ const Provider& (*inst)(void*) = (const Provider& (*)(void*)) dlsym(handle, "provider_const_ref");
- #endif
-
- if (inst)
projects / gentoo.git / commitdiff