version bump to 3.3.2 as per bug #246936 all thanks to Arfrever Frehtes Taifersar Arahesis

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

8 files changed, 175 insertions, 9 deletions

diff --git a/dev-libs/cryptlib/ChangeLog b/dev-libs/cryptlib/ChangeLog
index fdea95969d6e..066802274176 100644
--- a/dev-libs/cryptlib/ChangeLog
+++ b/dev-libs/cryptlib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/cryptlib
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.14 2007/02/16 14:36:34 alonbl Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.15 2009/01/31 00:20:57 dragonheart Exp $
+
+*cryptlib-3.3.2 (31 Jan 2009)
+
+  31 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  +files/cryptlib-3.3.2-external-zlib.patch, +files/cryptlib-3.3.2-ld.patch,
+  +files/cryptlib-3.3.2-pthread_yield.patch, +cryptlib-3.3.2.ebuild:
+  version bump to 3.3.2 as per bug #246936 all thanks to Arfrever Frehtes
+  Taifersar Arahesis
 
 *cryptlib-3.3.1 (16 Feb 2007)
 
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index 7378e8774300..d9c5d43c21c7 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -1,8 +1,14 @@
 AUX cryptlib-3.3.0-ld.patch 441 RMD160 bd6e4fee7ac58189acdb5ac91bdc091189ea3892 SHA1 4249474c2d5437e3665700b4558e7d0c38c14cfd SHA256 d0fdbaa75c425ad85b477596adf1dc6eec6002cd20f1f1cd8fff44f1603872b9
+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.3.2-pthread_yield.patch 392 RMD160 6fad9f08dbf0370979ecafe345d560671655943b SHA1 5ee34b0ac203c5ed6f95c77aa5530a8669b0a702 SHA256 63cac3ea73d7ffdb6ee52fae9f01ab899fd00b4b3869fbcc5bcdf2714f3bf550
 DIST cl33.zip 3779126 RMD160 82e38db5ceed4a1c7ae7f58510c1005b7760fa87 SHA1 830086620b9d7d0eeec674df456608d0e8b68228 SHA256 8c9d784d7699456e1aff2211cde6b95962116f43a05e869a0caec21b5be754b8
 DIST cl331.zip 3802344 RMD160 b15df19d5c5550d4542e8a075fa70a0b15cd5b16 SHA1 892a891a52b946e86664909157a290e30e1b1fe3 SHA256 630ac09c4febc5c131ed2e0370a10595008a849f4cb36427dc1be06463ed4079
+DIST cl332.zip 4236301 RMD160 e27427e2a62ff58d70e4e25c48b6b4932cae670e SHA1 c334e9b94bda14466da43ea51af3d954e9f8a511 SHA256 7757f55f59a58dfa79f400bf4e07fc30801951e6ae94b72a5eb1ea8a8925b119
 DIST cryptlib-3.3.0-manual.pdf.bz2 1682939 RMD160 3a49a5e4fdb7cf6d9dff39484657ac79330a7351 SHA1 998b0c5b23b1c4d7a899aa2015b78e91a27c4750 SHA256 1cf398964cad66b729d278b133ef463075b7824914e082b0fe0b086810a6b0e1
-EBUILD cryptlib-3.3.0-r1.ebuild 1994 RMD160 1e049ceb83eba2dce8c07179e57105b545f1a9ab SHA1 4d2a930d9bf436ae4db368121db04838c11d5100 SHA256 6901bb99f9c25527a3787f7a0bf90145e6df1c7da62eb39baf326d9dc6ae41bb
-EBUILD cryptlib-3.3.1.ebuild 2052 RMD160 c74ac04f6185fc80eeb50a64169a525e0cda151d SHA1 3373967a59fb79b3ef040aefc53ea1dc9f547da6 SHA256 39f4326b3940d9ec50e157763ade8f1df3b9902771cf444e83275ea468b86d54
-MISC ChangeLog 3223 RMD160 11c06a9507a6d9ebed8100079e2748af3db9e9c4 SHA1 caeb87ea15de13de3522c73fa8acaa4fc509da30 SHA256 0fe754dd4bb1c1d3e71bdbdb0adb1a609428abf8d0b5968365114568400e54ee
+DIST cryptlib-3.3.2-manual.pdf.bz2 1057792 RMD160 648e45141bb4160903263b21c71ba67903f0475d SHA1 c29f34d90474eff3b978d7627582d2fa5aa5e240 SHA256 be8e319fe7afa5ec9d0d756f46ca7bce1daf8e0d408e7abe08b62055d83b2c0c
+EBUILD cryptlib-3.3.0-r1.ebuild 1999 RMD160 80066c503598ac8a6ed081f3e805adfa12fa4402 SHA1 e85edffb4ea1a191f4410483884c7cf62d4b13c8 SHA256 a4016d2596e9cf5d2f12702c8dd5ab7b2afabe7a12b66a2ce690c678054f58f4
+EBUILD cryptlib-3.3.1.ebuild 2057 RMD160 682799b352a9e8ee36a1615783834f6fdca69d34 SHA1 f1417d21197c4b03ba96787aacabd0c27e7b379c SHA256 e87cad63d980ec299fcd3db72f31842ab14341fbce5bca3cd6c3b56a69f4dbc8
+EBUILD cryptlib-3.3.2.ebuild 2439 RMD160 4f25fec5ed57a8f05ad84b62ad756bf080d30075 SHA1 cb5cd729e9a2a6558919049a89a10f645a9b5d53 SHA256 28d2c4d66bfbf724ee82050329345e179185120d1951c54560eabbf8dacaf54c
+MISC ChangeLog 3554 RMD160 73cf4d7ef5703dd2e923f3a73e618aff8c49c888 SHA1 88409c1dd3a0ea5997e6766da5015b7304f09a20 SHA256 0339ebe766c86f599b0b82163795ee604e4a2395a411c8613a6ade24bace6e60
 MISC metadata.xml 217 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 SHA1 d899a6870ab5af7dfe496ae91441fb7c103556a9 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759
diff --git a/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild
index 3bc7f897dbac..54b6bb976c32 100644
--- a/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild,v 1.1 2007/02/05 08:53:35 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild,v 1.2 2009/01/31 00:20:57 dragonheart Exp $
 
 inherit eutils multilib flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
 	doc? ( mirror://gentoo/${P}-manual.pdf.bz2 )"
 
 LICENSE="Sleepycat"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="doc odbc"
 
diff --git a/dev-libs/cryptlib/cryptlib-3.3.1.ebuild b/dev-libs/cryptlib/cryptlib-3.3.1.ebuild
index a3401e4d0c17..0ab5a0ffb861 100644
--- a/dev-libs/cryptlib/cryptlib-3.3.1.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.1.ebuild,v 1.1 2007/02/16 14:36:34 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.1.ebuild,v 1.2 2009/01/31 00:20:57 dragonheart Exp $
 
 inherit eutils multilib flag-o-matic
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
 	doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
 
 LICENSE="Sleepycat"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="doc odbc"
 
diff --git a/dev-libs/cryptlib/cryptlib-3.3.2.ebuild b/dev-libs/cryptlib/cryptlib-3.3.2.ebuild
new file mode 100644
index 000000000000..acf6a4cfcb51
--- /dev/null
+++ b/dev-libs/cryptlib/cryptlib-3.3.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.2.ebuild,v 1.1 2009/01/31 00:20:57 dragonheart Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV="${PV//.0}"
+MY_PV="${MY_PV//.}"
+
+DESCRIPTION="Powerful security toolkit for adding encryption to software"
+HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
+DOC_PREFIX="${PN}-3.3.2"
+SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
+	doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
+
+LICENSE="Sleepycat"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc ldap odbc"
+
+S="${WORKDIR}"
+
+RDEPEND="sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+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"
+	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"
+
+	# respect LDFLAGS and fix soname and strip issues
+	epatch "${FILESDIR}/${P}-ld.patch"
+
+	# fix build
+	epatch "${FILESDIR}/${P}-pthread_yield.patch"
+
+	# use external zlib
+	epatch "${FILESDIR}/${P}-external-zlib.patch"
+}
+
+src_compile() {
+	# we need at least -O2
+	replace-flags -O  -O2
+	replace-flags -O0 -O2
+	replace-flags -O1 -O2
+	replace-flags -Os -O2
+	is-flagq -O* || append-flags -O2
+
+	append-flags -c -D__UNIX__ -DNDEBUG -I.
+	# QA issue for pthread_yield
+	append-flags -D_GNU_SOURCE
+
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake static failed"
+
+	emake shared CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake shared failed"
+}
+
+src_install() {
+	dolib.so "libcl.so.3.3.2"
+	dosym "libcl.so.3.3.2" "/usr/$(get_libdir)/libcl.so"
+	dolib.a "libcl.a"
+
+	insinto /usr/include
+	doins cryptlib.h
+
+	dodoc README
+	use doc && newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
+}
diff --git a/dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch b/dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch
new file mode 100644
index 000000000000..dcff438c90e9
--- /dev/null
+++ b/dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch
@@ -0,0 +1,36 @@
+--- makefile
++++ makefile
+@@ -241,8 +241,7 @@
+ 
+ OBJS		= $(BNOBJS) $(CERTOBJS) $(CRYPTOBJS) $(CTXOBJS) $(DEVOBJS) \
+ 			  $(ENVOBJS) $(HASHOBJS) $(IOOBJS) $(KEYSETOBJS) $(KRNLOBJS) \
+-			  $(LIBOBJS) $(MECHOBJS) $(MISCOBJS) $(SESSOBJS) $(ZLIBOBJS) \
+-			  $(OSOBJS)
++			  $(LIBOBJS) $(MECHOBJS) $(MISCOBJS) $(SESSOBJS) $(OSOBJS)
+ 
+ # Object files for the self-test code
+ 
+@@ -1299,7 +1298,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
++++ envelope/envelope.h
+@@ -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.3.2-ld.patch b/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch
new file mode 100644
index 000000000000..e54f88fc3c73
--- /dev/null
+++ b/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch
@@ -0,0 +1,19 @@
+--- tools/buildsharedlib.sh
++++ tools/buildsharedlib.sh
+@@ -115,13 +115,13 @@
+ 	*)
+ 		if [ `$LD -v 2>&1 | grep -c gcc` -gt 0 -a \
+ 			`gcc -Wl,-Bsymbolic 2>&1 | grep -c unrecognized` = 0 ] ; then
+-			$LD -shared -Wl,-Bsymbolic -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ;
++			$LD -shared $LDFLAGS -Wl,-soname,$LIBNAME -Wl,-Bsymbolic -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ;
+ 		else
+-			$LD -shared -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ;
++			$LD -shared $LDFLAGS -Wl,-soname,$LIBNAME -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ;
+ 		fi
+ 		if [ `which objdump` -a `objdump -p $LIBNAME | grep -c TEXTREL` -gt '0' ] ; then
+ 			echo "Warning: Shared library still contains TEXTREL records." ;
+ 		fi
+-		strip $LIBNAME ;;
++		;;
+ esac
+ rm -f $LINKFILE
diff --git a/dev-libs/cryptlib/files/cryptlib-3.3.2-pthread_yield.patch b/dev-libs/cryptlib/files/cryptlib-3.3.2-pthread_yield.patch
new file mode 100644
index 000000000000..f976ad5a813e
--- /dev/null
+++ b/dev-libs/cryptlib/files/cryptlib-3.3.2-pthread_yield.patch
@@ -0,0 +1,11 @@
+--- kernel/thread.h
++++ kernel/thread.h
+@@ -1712,7 +1712,7 @@
+ 	 underlying process context should yield the associated thread */
+   #define THREAD_YIELD()		yield()
+ #else
+-  #ifdef __linux__
++  #if defined(__linux__) && !defined(__USE_GNU)
+ 	void pthread_yield( void );
+   #endif /* Present but not prototyped unless GNU extensions are enabled */
+   #define  THREAD_YIELD()		pthread_yield()