dev-libs/cryptlib version bump wrt bug 351834.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux i686

5 files changed, 248 insertions, 3 deletions

diff --git a/dev-libs/cryptlib/ChangeLog b/dev-libs/cryptlib/ChangeLog
index 853f6c5ab13a..f42102377fb6 100644
--- a/dev-libs/cryptlib/ChangeLog
+++ b/dev-libs/cryptlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cryptlib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.25 2010/11/28 02:02:36 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.26 2011/01/20 14:17:34 c1pher Exp $
+
+*cryptlib-3.4.0 (20 Jan 2011)
+
+  20 Jan 2011; Dane Smith <c1pher@gentoo.org> +cryptlib-3.4.0.ebuild,
+  +files/cryptlib-3.4.0-external-zlib.patch,
+  +files/cryptlib-3.4.0-python.patch:
+  Version bump wrt bug 351834. Adds new patches.
 
   28 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -cryptlib-3.3.3.ebuild:
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index f56ed927e013..ef8c55dd6a6c 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -1,7 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cryptlib-3.3.2-external-zlib.patch 1086 RMD160 9f9da93a99945d66302d3bb458029d815bcbf61c SHA1 c37209b57b2f8fdc32c5bff2be14116c373a91ae SHA256 ca7bf1670b83380e26a51f4dceb0684c2d0694338c509cc36bbb2bb6deb31f8c
 AUX cryptlib-3.3.2-ld.patch 821 RMD160 391e5a689f906a858c20be3721ccc3c3c81faa15 SHA1 2fe7573d1cd3f9f2f7d6ec18568420ac01d288a7 SHA256 0e813cd10d11f0dcfb8420d5e8690bf682faeb50e83c221a7e5bd35d44eaab4f
+AUX cryptlib-3.4.0-external-zlib.patch 1194 RMD160 e67b232ae57c43dde00dc79b48a78e52ed234798 SHA1 a69863fb2c290526360bd54405e94fc7efc158d8 SHA256 18cc9f193de28e7cfbf322d0ee47587fe334b2751bb397851b2b09b76f3c0c85
+AUX cryptlib-3.4.0-python.patch 1888 RMD160 9aa675d1a3fbb0a6aa2e9c5103ece9892454f611 SHA1 49379a91e29591106fd0723d4dba6dc34c3cc5f8 SHA256 1a857ff90e833e5f32a927f6568d63d616f82e3339691041562d89ea6692370f
 DIST cl333.zip 4530664 RMD160 4c84557c088b114cdc81e36ed3cc29960b822698 SHA1 128d24c98f1406cb4ba547617a73ec1e254caf33 SHA256 93e790963a93dd97843bce73908768bcf391103ebf4d71c893d4d35a220d327e
+DIST cl340.zip 5514751 RMD160 d38cf69841942670f84e4c2d64a708f5cb3d4299 SHA1 78f7599971c889a55346ddf858e3ef147a5270f0 SHA256 fff4cca9e70e579763882cd58bc8a5b36c52c20a7ace6c8b21c5e4e9e05fd9d5
 DIST cryptlib-3.3.3-manual.pdf.bz2 1066618 RMD160 27f18912b4f0194b76ca3a9a53839ec028c2473b SHA1 a87611f8aa69117b9bc511bb6c865ab8d723a94b SHA256 a52b0a7ef4c7288442f3189e1050492fa9c6c5048a09ce5f161a2a402dd068da
+DIST cryptlib-3.4.0-manual.pdf.bz2 1215921 RMD160 9070e2ed2fd748463cd06f09e22d422ce79bc0eb SHA1 bcb4f6bd558920b69a04bfd757460fc8f16afd7a SHA256 b06b736e6e123f578adcd08a8ede6cdb62e3e6d4ac2decb3570def1b29d44da8
 EBUILD cryptlib-3.3.3-r1.ebuild 3488 RMD160 115fd9a38be64f0ac5849092c5d126907a15f183 SHA1 1eef249d8cf1f054a9a51f779b8aa665904a97bb SHA256 5a8ccfeed827bb5bcece96b55a81564c9025fca165f03b9f5977f7dcf37dcf39
-MISC ChangeLog 5111 RMD160 c1ad631bbfeb6ddcfddcf48c77baf54af6e97b85 SHA1 66f4ba9dbc0b2b1b8e40f2546956bd5893129d57 SHA256 ce31f17d90af86c9adf395875b70b7e4af7744337e51a4e5eb698fc76401d8b9
+EBUILD cryptlib-3.4.0.ebuild 3490 RMD160 b299f191b0e6a94f6533e853b8fbff176529a331 SHA1 56e9b49e4300f31c3551d884854532494096e781 SHA256 1caead4d853e28625504d2a114102817fc86ba84953b2231af8696b40e603ad9
+MISC ChangeLog 5343 RMD160 68b82cc38ba10a76daf66757ad1751507298b547 SHA1 7fa91b09b2990d34f70791e898ed84a01eeec696 SHA256 699482704ba9e0e91925be22b23a82872f64822c2407c827ebac6a536d6a428a
 MISC metadata.xml 217 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 SHA1 d899a6870ab5af7dfe496ae91441fb7c103556a9 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNOEO0AAoJEEsurZwMLhUx1kkP/iW8yIVOLxMmPvMcFoAek19G
+cXrCmHRtfeSyXxv1ysCGqTjVGwKpaaBgw7H/rSLUUgkNroKgb6vdmYTzhf/pTuW+
+eJTSQD6clW8nRLJeFEiQzhvQmJeVLCr9XlFBhLFwgKoMIMUI0j3J423nNpWcUEGF
+fnsR6Fi+aadAFDc5e/jk2OaWgrabUzlHJxlpHctF96sRQw9Nl8rcj6/vXtREWocE
+WQMY3LyMfDXKBpB0cqd32qYHRk+er7rW7ZD0bFASzm7ruBaBkklKS+f6TbBZKwGa
+OrpEKvt/R8V7qzSrlKLUWYUton5kUb4QioaE3rNuBqExsBd0E9nkHgUUYZj2ylVo
+5RVeYvxgcXMUj8aSe2z1doEwLxSebUfMbS9qU7zIURyx8xEP9IkdYkzaoPvyZg0c
+pCAxD0UxHV5/ilQGE1vY8NxbEDsWoEukmGGvwVUAY9VO6rFTg0e/viDTJtnBBAT4
+NR6xQu5TfBiKr6l7523O3I8SyApsdvwrwh2zsDkURQhsTXLlKZ3ebIHyNJHUQFHb
+8WkFYguv9aHmQLxPZ+CI7W7UOUTLLcZ2/HPCUe5BF4SvB04ZfHyF1/oZ3C3QXyao
+DY277lpYl5aXzuLWBwx1qOfrk4U4hTzgsAZARtQ/mHt8sajycM157bvLesbkwRzU
+nIL/O+UvQwJAhP8HGa06
+=GhD6
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/cryptlib/cryptlib-3.4.0.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0.ebuild
new file mode 100644
index 000000000000..cd4baa6ae779
--- /dev/null
+++ b/dev-libs/cryptlib/cryptlib-3.4.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.4.0.ebuild,v 1.1 2011/01/20 14:17:34 c1pher Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV="${PV//.}"
+
+DESCRIPTION="Powerful security toolkit for adding encryption to software"
+HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
+DOC_PREFIX="${PN}-${PV}"
+SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
+	doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
+
+LICENSE="DB"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc ldap odbc python"
+
+S="${WORKDIR}"
+
+RDEPEND="sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	odbc? ( dev-db/unixODBC )
+	!dev-python/cryptlib_py"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+DISTUTILS_SETUP_FILES="bindings/setup.py"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_unpack() {
+	# we need the -a option, so we can not use 'unpack'
+	unzip -qoa "${DISTDIR}/cl${MY_PV}.zip"
+	use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
+}
+
+src_prepare() {
+	rm -fr zlib
+
+	# we want our own CFLAGS ;-)
+	sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \
+		-e "s:-O3::g" -e "s:-O4::g"	makefile || die "sed makefile failed"
+	sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e "s/-mcpu=[[:alnum:]\.=-]*//g" \
+		-e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed tools/ccopts.sh failed"
+
+	# change 'make' to '$(MAKE)'
+	sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed"
+
+	# NOTICE:
+	# Because of stack execution
+	# assembly parts are disabled.
+	sed -i -e 's:i\[3,4,5,6\]86:___:g' makefile || die "sed makefile failed"
+
+	# Fix version number of shared library.
+	sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed"
+
+	# Respect LDFLAGS and fix soname and strip issues.
+	epatch "${FILESDIR}/${PN}-3.3.2-ld.patch"
+
+	# Use external zlib.
+	epatch "${FILESDIR}/${PN}-3.4.0-external-zlib.patch"
+
+	#Fix setup.py
+	epatch "${FILESDIR}"/${P}-python.patch
+}
+
+src_compile() {
+	local libname="libcl.so.${PV}"
+
+	# At least -O2 is needed.
+	replace-flags -O  -O2
+	replace-flags -O0 -O2
+	replace-flags -O1 -O2
+	replace-flags -Os -O2
+	is-flagq -O* || append-flags -O2
+
+	append-flags "-D __UNIX__ -DOSVERSION=2 -DNDEBUG -I."
+
+	if [ -f /usr/include/pthread.h -a \
+	`grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then
+		append-flags "-DHAS_RECURSIVE_MUTEX"
+	fi
+	if [ -f /usr/include/pthread.h -a \
+	`grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then
+		append-flags "-DHAS_ROBUST_MUTEX"
+	fi
+
+	use ldap && append-flags -DHAS_LDAP
+	use odbc && append-flags -DHAS_ODBC
+
+	emake directories || die
+	emake toolscripts || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c" Linux || die "emake static failed"
+
+	emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \
+	CFLAGS="${CFLAGS} -fPIC -c" Linux || die "emake shared failed"
+
+	if use python; then
+		ln -s libcl.so.${PV} libcl.so || die
+
+		# Python bindings don't work with -O2 and higher.
+		replace-flags -O* -O1
+		distutils_src_compile
+	fi
+}
+
+src_install() {
+	dolib.so "libcl.so.${PV}" || die
+	dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so" || die
+	dolib.a "libcl.a" || die
+
+	insinto /usr/include
+	doins cryptlib.h || die
+
+	if use python; then
+		distutils_src_install
+	fi
+
+	dodoc README || die
+	if use doc; then
+		newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf" || die
+	fi
+}
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.0-external-zlib.patch b/dev-libs/cryptlib/files/cryptlib-3.4.0-external-zlib.patch
new file mode 100644
index 000000000000..5b599b76294a
--- /dev/null
+++ b/dev-libs/cryptlib/files/cryptlib-3.4.0-external-zlib.patch
@@ -0,0 +1,35 @@
+--- makefile	2011-01-18 14:23:05.000000000 -0500
++++ makefile.new	2011-01-18 14:25:47.000000000 -0500
+@@ -259,7 +259,7 @@
+ OBJS		= $(BNOBJS) $(CERTOBJS) $(CRYPTOBJS) $(CTXOBJS) $(DEVOBJS) \
+ 			  $(ENCDECOBJS) $(ENVOBJS) $(HASHOBJS) $(IOOBJS) $(KEYSETOBJS) \
+ 			  $(KRNLOBJS) $(LIBOBJS) $(MECHOBJS) $(MISCOBJS) $(SESSOBJS) \
+-			  $(ZLIBOBJS) $(OSOBJS)
++			  $(OSOBJS)
+ 
+ # Object files for the self-test code
+ 
+@@ -1477,7 +1477,7 @@
+ 
+ $(SLIBNAME):	$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
+ 				@./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) $(OBJS) \
+-					$(EXTRAOBJS)
++					$(EXTRAOBJS) -lz
+ 
+ $(DYLIBNAME):	$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
+ 				@$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
+--- envelope/envelope.h	2010-12-14 23:16:40.000000000 -0500
++++ envelope.h.new	2011-01-18 14:28:06.000000000 -0500
+@@ -17,11 +17,7 @@
+   #endif /* Compiler-specific includes */
+ #endif /* _STREAM_DEFINED */
+ #ifdef USE_COMPRESSION
+-  #if defined( INC_ALL )
+-	#include "zlib.h"
+-  #else
+-	#include "zlib/zlib.h"
+-  #endif /* Compiler-specific includes */
++	#include <zlib.h>
+ #endif /* USE_COMPRESSION */
+ 
+ /****************************************************************************
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.0-python.patch b/dev-libs/cryptlib/files/cryptlib-3.4.0-python.patch
new file mode 100644
index 000000000000..e7aa41376497
--- /dev/null
+++ b/dev-libs/cryptlib/files/cryptlib-3.4.0-python.patch
@@ -0,0 +1,50 @@
+--- bindings/setup.py	2010-12-13 04:51:58.000000000 -0500
++++ setup.py.new	2011-01-19 08:41:40.000000000 -0500
+@@ -15,7 +15,7 @@
+     ext = Extension("cryptlib_py",
+                     sources=["bindings/python.c"],
+-                    library_dirs=['..'],
++                    library_dirs=['.'],
+-                    libraries=['cl'])
++                    libraries=['cl','resolv'])
+ 
+ setup(name="cryptlib_py", ext_modules=[ext])
+
+--- bindings/python.c	2010-11-30 18:35:52.000000000 -0500
++++ python.c.new	2011-01-19 09:05:43.000000000 -0500
+@@ -358,6 +358,7 @@
+ 	return(processStatus(status));
+ }
+ 
++/*
+ static PyObject* python_cryptGenerateKeyAsync(PyObject* self, PyObject* args)
+ {
+ 	int status = 0;
+@@ -396,6 +397,7 @@
+ 	
+ 	return(processStatus(status));
+ }
++*/
+ 
+ static PyObject* python_cryptEncrypt(PyObject* self, PyObject* args)
+ {
+@@ -1429,9 +1431,9 @@
+ 	{ "cryptDestroyContext", python_cryptDestroyContext, METH_VARARGS }, 
+ 	{ "cryptDestroyObject", python_cryptDestroyObject, METH_VARARGS }, 
+ 	{ "cryptGenerateKey", python_cryptGenerateKey, METH_VARARGS }, 
+-	{ "cryptGenerateKeyAsync", python_cryptGenerateKeyAsync, METH_VARARGS }, 
+-	{ "cryptAsyncQuery", python_cryptAsyncQuery, METH_VARARGS }, 
+-	{ "cryptAsyncCancel", python_cryptAsyncCancel, METH_VARARGS }, 
++//	{ "cryptGenerateKeyAsync", python_cryptGenerateKeyAsync, METH_VARARGS }, 
++//	{ "cryptAsyncQuery", python_cryptAsyncQuery, METH_VARARGS }, 
++//	{ "cryptAsyncCancel", python_cryptAsyncCancel, METH_VARARGS }, 
+ 	{ "cryptEncrypt", python_cryptEncrypt, METH_VARARGS }, 
+ 	{ "cryptDecrypt", python_cryptDecrypt, METH_VARARGS }, 
+ 	{ "cryptSetAttribute", python_cryptSetAttribute, METH_VARARGS }, 
+@@ -4892,4 +4894,4 @@
+     v = Py_BuildValue("i", -50);
+     PyDict_SetItemString(moduleDict, "CRYPT_ENVELOPE_RESOURCE", v);
+     Py_DECREF(v); /* Need resource to proceed */
+-}
+\ No newline at end of file
++}