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

(Portage version: 2.2_rc23/cvs/Linux x86_64)

7 files changed, 166 insertions, 6 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/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()