public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cryptlib/, dev-libs/cryptlib/files/
@ 2016-06-11 12:59 Alon Bar-Lev
  0 siblings, 0 replies; 3+ messages in thread
From: Alon Bar-Lev @ 2016-06-11 12:59 UTC (permalink / raw
  To: gentoo-commits

commit:     597c3171bdc822183a04ff1805b9349c137e0ec3
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 12:55:36 2016 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 12:59:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597c3171

dev-libs/cryptlib: version bump

Bug: 585008

Package-Manager: portage-2.2.28

 dev-libs/cryptlib/Manifest                         |   1 +
 dev-libs/cryptlib/cryptlib-3.4.3.ebuild            | 130 +++++++++++++++++++++
 dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch |  54 +++++++++
 dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch  |  55 +++++++++
 4 files changed, 240 insertions(+)

diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index 1fd4be6..b624a48 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -1,2 +1,3 @@
 DIST cl340.zip 5514751 SHA256 fff4cca9e70e579763882cd58bc8a5b36c52c20a7ace6c8b21c5e4e9e05fd9d5 SHA512 b9091ee4ce589f95ce479a0de25c5456db18d955350cc245637addf31f3c03cfe87c971f5a7bff274d17451059d319723cd337cb25a672e0823e29b98b4b87f8 WHIRLPOOL 8965d0c6b0e0bd38d0bbf674a75ac43ea7ea482218c6592d51d0baa7a6ff8673a27c8095084dc7d7cbca39c29bc9acdb6351d6a1f64f6cdc6c1bf906b2579cff
+DIST cl343.zip 5703258 SHA256 08b104442bb5c7281a3299853d5585cc63bd928454dff3150569c02b957427ad SHA512 abbd53c00be82749f7e359f22cd45ef2b1d90040427457ee8d452d2b513093789b99fa8e904b8a7c75e8db046c59d96e966ce64c2b3630bd21cf3e91b57bc58a WHIRLPOOL 0e1f9dd18172ac9ba244845147e7da41932ea13099aa94957b090be2eb302f179a96bb64c04ddcb74f21cdf5be0c6ed849df4076eb77cbde912719a73ffb1b26
 DIST cryptlib-3.4.0-manual.pdf.bz2 1215921 SHA256 b06b736e6e123f578adcd08a8ede6cdb62e3e6d4ac2decb3570def1b29d44da8 SHA512 dbf9914a110a686dc23fedd23c16cefbae12cc67e378db67ac292f8f782b3b615a5819013f2b9c4861086c7ddfab690db9d68a911346102def323255cf48069b WHIRLPOOL 8cc64ab7ffe8a97714e793dd3dfe36708e7e2c7ec583479c593d767de22b860be5bcf0a70427f6f2e7e1d9732ec4ba2d2b3f1617f97bb649c0298924e4a93fb6

diff --git a/dev-libs/cryptlib/cryptlib-3.4.3.ebuild b/dev-libs/cryptlib/cryptlib-3.4.3.ebuild
new file mode 100644
index 0000000..a0078b8
--- /dev/null
+++ b/dev-libs/cryptlib/cryptlib-3.4.3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs versionator
+
+MY_PV="${PV//.}"
+
+DESCRIPTION="Powerful security toolkit for adding encryption to software"
+HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
+DOC_PREFIX="${PN}-$(get_version_component_range 1-2 ${PV}).0"
+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 python"
+
+S="${WORKDIR}"
+
+RDEPEND="sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	odbc? ( dev-db/unixODBC )
+	python? ( ${PYTHON_DEPS} )"
+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" || die
+	use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
+}
+
+wrap_python() {
+	if use python; then
+		cd bindings || die
+		distutils-r1_${1}
+	fi
+}
+
+src_prepare() {
+	rm -fr zlib || die
+
+	# 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}/${P}-build.patch"
+
+	# Use external zlib.
+	epatch "${FILESDIR}/${P}-zlib.patch"
+
+	wrap_python ${FUNCNAME}
+}
+
+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 "-fPIC -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
+	emake toolscripts
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c" STRIP=true Linux
+
+	emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -c" STRIP=true Linux
+
+	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
+
+		wrap_python ${FUNCNAME}
+	fi
+}
+
+src_install() {
+	dolib.so "libcl.so.${PV}"
+	dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so"
+	dolib.a "libcl.a"
+
+	doheader cryptlib.h
+
+	dodoc README
+	if use doc; then
+		newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
+	fi
+
+	wrap_python ${FUNCNAME}
+}

diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch b/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch
new file mode 100644
index 0000000..309d732
--- /dev/null
+++ b/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch
@@ -0,0 +1,54 @@
+From 58d3e56f59e0e8d48d913c217929b35e9366e829 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 11 Jun 2016 15:07:12 +0300
+Subject: [PATCH] build: so: support LDFLAGS and SONAME
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ tools/buildsharedlib.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/buildsharedlib.sh b/tools/buildsharedlib.sh
+index f1277a7..59c4713 100644
+--- a/tools/buildsharedlib.sh
++++ b/tools/buildsharedlib.sh
+@@ -131,9 +131,9 @@ case $OSNAME in
+ 	*)
+ 		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 -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." ;
+-- 
+2.7.3
+
+From b11541f4beaf8395dd90de53b57933661e120b0a Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 11 Jun 2016 15:34:57 +0300
+Subject: [PATCH 3/3] build: ignore DL_EXPORT on non windows
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ cryptlib.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cryptlib.h b/cryptlib.h
+index 61cf338..4738852 100644
+--- a/cryptlib.h
++++ b/cryptlib.h
+@@ -122,6 +122,7 @@
+   #define C_CHR char
+   #define C_STR C_CHR *
+   #define C_RET	int
++  #define DL_EXPORT(type) type
+ #endif /* Windows vs.everything else function types */
+ 
+ /* Symbolic defines to make it clearer how the function parameters behave */
+-- 
+2.7.3
+

diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch b/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch
new file mode 100644
index 0000000..26c723c
--- /dev/null
+++ b/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch
@@ -0,0 +1,55 @@
+From 70b00d882e9ff1e17bb82b3e722def0b71f2374a Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 11 Jun 2016 15:15:25 +0300
+Subject: [PATCH 2/2] build: use system zlib
+
+this should be a toggle of build system not hard coded.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ envelope/envelope.h | 6 +-----
+ makefile            | 4 ++--
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/envelope/envelope.h b/envelope/envelope.h
+index 028f4b2..4ef6b20 100644
+--- a/envelope/envelope.h
++++ b/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/makefile b/makefile
+index c762d02..24c180a 100644
+--- a/makefile
++++ b/makefile
+@@ -283,7 +283,7 @@ ZLIBOBJS	= $(OBJPATH)adler32.o $(OBJPATH)deflate.o $(OBJPATH)inffast.o \
+ 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
+ 
+@@ -1483,7 +1483,7 @@ $(LIBNAME):		$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
+ 
+ $(SLIBNAME):	$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
+ 				@./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) \
+-					$(STRIP) $(OBJS) $(EXTRAOBJS)
++					$(STRIP) $(OBJS) $(EXTRAOBJS) -lz
+ 
+ $(DYLIBNAME):	$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
+ 				@$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
+-- 
+2.7.3
+


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cryptlib/, dev-libs/cryptlib/files/
@ 2017-02-05 19:03 Alon Bar-Lev
  0 siblings, 0 replies; 3+ messages in thread
From: Alon Bar-Lev @ 2017-02-05 19:03 UTC (permalink / raw
  To: gentoo-commits

commit:     41509daa139cc19bd8d5753057444be9a2536e92
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 19:02:42 2017 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 19:03:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41509daa

dev-libs/cryptlib: fixups

Remove cflags translations based on upstream recommendation
we should interact with upstream if there are issues.

Remove the test patch as it was not helpful, tests were
accessing network anyway. Added restrict tests.

Add static-libs USE for pleasure

Package-Manager: portage-2.3.3

 ....4.3.1-r1.ebuild => cryptlib-3.4.3.1-r2.ebuild} | 21 +++------
 .../cryptlib/files/cryptlib-3.4.3.1-tests.patch    | 52 ----------------------
 2 files changed, 6 insertions(+), 67 deletions(-)

diff --git a/dev-libs/cryptlib/cryptlib-3.4.3.1-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
similarity index 87%
rename from dev-libs/cryptlib/cryptlib-3.4.3.1-r1.ebuild
rename to dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
index d63a959..b9161e5 100644
--- a/dev-libs/cryptlib/cryptlib-3.4.3.1-r1.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
 LICENSE="Sleepycat"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="doc ldap odbc python test"
+IUSE="doc ldap odbc python static-libs test"
 
 S="${WORKDIR}"
 
@@ -34,9 +34,11 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
 	"${FILESDIR}/${P}-zlib.patch"
-	"${FILESDIR}/${P}-tests.patch"
 )
 
+# test access the network
+RESTRICT="test"
+
 src_unpack() {
 	# we need the -a option, so we can not use 'unpack'
 	unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die
@@ -68,19 +70,12 @@ src_prepare() {
 }
 
 src_compile() {
-	# 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
-
 	use ldap && append-cppflags -DHAS_LDAP
 	use odbc && append-cppflags -DHAS_ODBC
 
 	export DISABLE_AUTODETECT=1
-	emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" default
 	emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" shared
+	use static-libs && emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" default
 	use test && emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" stestlib
 
 	#
@@ -94,10 +89,6 @@ src_compile() {
 	ln -s "${solibname}" libcl.so || die
 
 	if use python; then
-
-		# Python bindings don't work with -O2 and higher.
-		replace-flags -O* -O1
-
 		wrap_python ${FUNCNAME}
 	fi
 }
@@ -112,7 +103,7 @@ src_install() {
 	doheader cryptlib.h
 
 	dolib.so libcl.so*
-	dolib.a libcl.a
+	use static-libs && dolib.a libcl.a
 
 	if use doc; then
 		newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"

diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-tests.patch b/dev-libs/cryptlib/files/cryptlib-3.4.3.1-tests.patch
deleted file mode 100644
index f18bc96..00000000
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c25dad21f5b1db106e4fe42f38a0dac6290b8a41 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 4 Feb 2017 05:48:54 +0200
-Subject: [PATCH] tests: disable online tests
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- test/testfunc.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/test/testfunc.c b/test/testfunc.c
-index 79d7148..017a4a8 100644
---- a/test/testfunc.c
-+++ b/test/testfunc.c
-@@ -1119,6 +1119,7 @@ BOOLEAN testSessions( void )
- 		}
- 	if( !testSessionAttributes() )
- 		return( FALSE );
-+#if 0
- 	if( !testSessionSSH() )
- 		return( FALSE );
- 	if( !testSessionSSHPubkeyAuth() )
-@@ -1127,6 +1128,7 @@ BOOLEAN testSessions( void )
- 		return( FALSE );
- 	if( !testSessionSSHExec() )
- 		return( FALSE );
-+#endif
- 	if( !testSessionSSL() )
- 		return( FALSE );
- 	if( !testSessionSSLLocalSocket() )
-@@ -1147,14 +1149,18 @@ BOOLEAN testSessions( void )
- 	if( !testSessionTLS12ClientCert() )
- 		return( FALSE );
- #endif /* 0 */
-+#if 0
- 	if( !testSessionOCSP() )
- 		return( FALSE );
-+#endif
-+#if 0
- 	if( !testSessionTSP() )
- 		return( FALSE );
- 	if( !testSessionEnvTSP() )
- 		return( FALSE );
- 	if( !testSessionCMP() )
- 		return( FALSE );
-+#endif
- 
- 	return( TRUE );
- 	}
--- 
-2.10.2
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cryptlib/, dev-libs/cryptlib/files/
@ 2017-03-04 17:16 Alon Bar-Lev
  0 siblings, 0 replies; 3+ messages in thread
From: Alon Bar-Lev @ 2017-03-04 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     11bd7a0e53edb98cd3fb4749a7a4b0e6daaf3578
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 17:13:39 2017 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 17:16:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bd7a0e

dev-libs/cryptlib: cleanup

Bug: 611502

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/cryptlib/Manifest                         |   2 -
 dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild         | 141 ---------------------
 dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild         | 132 -------------------
 dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch    |  19 ---
 .../files/cryptlib-3.4.0-external-zlib.patch       |  35 -----
 .../cryptlib/files/cryptlib-3.4.0-python.patch     |  50 --------
 dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch |  54 --------
 dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch  |  55 --------
 8 files changed, 488 deletions(-)

diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index 0516966bfe5..c4284aeb356 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -1,4 +1,2 @@
-DIST cl340.zip 5514751 SHA256 fff4cca9e70e579763882cd58bc8a5b36c52c20a7ace6c8b21c5e4e9e05fd9d5 SHA512 b9091ee4ce589f95ce479a0de25c5456db18d955350cc245637addf31f3c03cfe87c971f5a7bff274d17451059d319723cd337cb25a672e0823e29b98b4b87f8 WHIRLPOOL 8965d0c6b0e0bd38d0bbf674a75ac43ea7ea482218c6592d51d0baa7a6ff8673a27c8095084dc7d7cbca39c29bc9acdb6351d6a1f64f6cdc6c1bf906b2579cff
-DIST cl343.zip 5703258 SHA256 08b104442bb5c7281a3299853d5585cc63bd928454dff3150569c02b957427ad SHA512 abbd53c00be82749f7e359f22cd45ef2b1d90040427457ee8d452d2b513093789b99fa8e904b8a7c75e8db046c59d96e966ce64c2b3630bd21cf3e91b57bc58a WHIRLPOOL 0e1f9dd18172ac9ba244845147e7da41932ea13099aa94957b090be2eb302f179a96bb64c04ddcb74f21cdf5be0c6ed849df4076eb77cbde912719a73ffb1b26
 DIST cl3431.zip 5828863 SHA256 4a608d725f66669d983083420f9f57f763f320292c50346de3e8c1caeee743bd SHA512 d6a3403361fe39b855ec85b030989c5dfc54e499260869de0de151ad6f62245020561dd308b86edf6792da9663e19a0c0d21c53aa7434b21e83eb4b7445fd8dc WHIRLPOOL eccc446361f7daa9cf5a017ae7e229b2003f198490b9cae1bed61fd7bd585e9a08ec54c6c035ba2c4f3e8a58d3eb9756a61f608d5a299c8cc66b159a87e95874
 DIST cryptlib-3.4.0-manual.pdf.bz2 1215921 SHA256 b06b736e6e123f578adcd08a8ede6cdb62e3e6d4ac2decb3570def1b29d44da8 SHA512 dbf9914a110a686dc23fedd23c16cefbae12cc67e378db67ac292f8f782b3b615a5819013f2b9c4861086c7ddfab690db9d68a911346102def323255cf48069b WHIRLPOOL 8cc64ab7ffe8a97714e793dd3dfe36708e7e2c7ec583479c593d767de22b860be5bcf0a70427f6f2e7e1d9732ec4ba2d2b3f1617f97bb649c0298924e4a93fb6

diff --git a/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild
deleted file mode 100644
index 5dfafa07169..00000000000
--- a/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 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="Sleepycat"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="doc ldap odbc python"
-
-S="${WORKDIR}"
-
-RDEPEND="sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	odbc? ( dev-db/unixODBC )
-	python? ( ${PYTHON_DEPS} )"
-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"
-}
-
-wrap_python() {
-	if use python; then
-		# cd bindings || die
-
-		distutils-r1_${1}
-	fi
-}
-
-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
-
-	# For some reason, setup.py is half-designed to be run from proper dir,
-	# and half-designed to be run from root. Since the patch fixes it to
-	# be completely from root, move it.
-	#
-	# When bumping the package, please update the patch to make setup.py work
-	# properly when executed from 'bindings' subdirectory.
-	mv bindings/setup.py . || die
-
-	wrap_python ${FUNCNAME}
-}
-
-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
-
-	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
-
-		wrap_python ${FUNCNAME}
-	fi
-}
-
-src_install() {
-	dolib.so "libcl.so.${PV}"
-	dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so"
-	dolib.a "libcl.a"
-
-	doheader cryptlib.h
-
-	dodoc README
-	if use doc; then
-		newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
-	fi
-
-	wrap_python ${FUNCNAME}
-}

diff --git a/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild
deleted file mode 100644
index d49963ee693..00000000000
--- a/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs versionator
-
-MY_PV="${PV//.}"
-
-DESCRIPTION="Powerful security toolkit for adding encryption to software"
-HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
-DOC_PREFIX="${PN}-$(get_version_component_range 1-2 ${PV}).0"
-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 python"
-
-S="${WORKDIR}"
-
-RDEPEND="sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	odbc? ( dev-db/unixODBC )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-zlib.patch"
-)
-
-src_unpack() {
-	# we need the -a option, so we can not use 'unpack'
-	unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die
-	use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
-}
-
-wrap_python() {
-	if use python; then
-		cd bindings || die
-		distutils-r1_${1}
-	fi
-}
-
-src_prepare() {
-	default
-
-	rm -fr zlib || die
-
-	# 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"
-
-	wrap_python ${FUNCNAME}
-}
-
-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 "-fPIC"
-	append-cppflags "-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-cppflags "-DHAS_RECURSIVE_MUTEX"
-	fi
-	if [ -f /usr/include/pthread.h -a \
-	`grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then
-		append-cppflags "-DHAS_ROBUST_MUTEX"
-	fi
-
-	use ldap && append-cppflags -DHAS_LDAP
-	use odbc && append-cppflags -DHAS_ODBC
-
-	emake directories
-	emake toolscripts
-	emake CC="$(tc-getCC)" CFLAGS="${CPPFLAGS} ${CFLAGS} -c" STRIP=true Linux
-
-	emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} -c" STRIP=true Linux
-
-	if use python; then
-		# Without this python will link against the static lib
-		ln -s libcl.so.${PV} libcl.so || die
-
-		# Python bindings don't work with -O2 and higher.
-		replace-flags -O* -O1
-
-		wrap_python ${FUNCNAME}
-	fi
-}
-
-src_install() {
-	dolib.so "libcl.so.${PV}"
-	dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so"
-	dolib.a "libcl.a"
-
-	doheader cryptlib.h
-
-	dodoc README
-	if use doc; then
-		newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
-	fi
-
-	wrap_python ${FUNCNAME}
-}

diff --git a/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch b/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch
deleted file mode 100644
index e54f88fc3c7..00000000000
--- a/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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.4.0-external-zlib.patch b/dev-libs/cryptlib/files/cryptlib-3.4.0-external-zlib.patch
deleted file mode 100644
index 5b599b76294..00000000000
--- a/dev-libs/cryptlib/files/cryptlib-3.4.0-external-zlib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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
deleted file mode 100644
index e7aa4137649..00000000000
--- a/dev-libs/cryptlib/files/cryptlib-3.4.0-python.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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
-+}

diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch b/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch
deleted file mode 100644
index 89a3a920c17..00000000000
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 58d3e56f59e0e8d48d913c217929b35e9366e829 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 11 Jun 2016 15:07:12 +0300
-Subject: [PATCH] build: so: support LDFLAGS and SONAME
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- tools/buildsharedlib.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/buildsharedlib.sh b/tools/buildsharedlib.sh
-index f1277a7..59c4713 100644
---- a/tools/buildsharedlib.sh
-+++ b/tools/buildsharedlib.sh
-@@ -131,9 +131,9 @@ case $OSNAME in
- 	*)
- 		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 -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." ;
--- 
-2.7.3
-
-From b11541f4beaf8395dd90de53b57933661e120b0a Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Sat, 11 Jun 2016 15:34:57 +0300
-Subject: [PATCH] build: ignore DL_EXPORT on non windows
-
-Signed-off-by: Dennis Schridde <devurandom@gmx.net>
----
- cryptlib.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cryptlib.h b/cryptlib.h
-index 61cf338..4738852 100644
---- a/cryptlib.h
-+++ b/cryptlib.h
-@@ -122,6 +122,7 @@
-   #define C_CHR char
-   #define C_STR C_CHR *
-   #define C_RET	int
-+  #define DL_EXPORT(type) type
- #endif /* Windows vs.everything else function types */
- 
- /* Symbolic defines to make it clearer how the function parameters behave */
--- 
-2.7.3
-

diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch b/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch
deleted file mode 100644
index 26c723c7940..00000000000
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 70b00d882e9ff1e17bb82b3e722def0b71f2374a Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 11 Jun 2016 15:15:25 +0300
-Subject: [PATCH 2/2] build: use system zlib
-
-this should be a toggle of build system not hard coded.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- envelope/envelope.h | 6 +-----
- makefile            | 4 ++--
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/envelope/envelope.h b/envelope/envelope.h
-index 028f4b2..4ef6b20 100644
---- a/envelope/envelope.h
-+++ b/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/makefile b/makefile
-index c762d02..24c180a 100644
---- a/makefile
-+++ b/makefile
-@@ -283,7 +283,7 @@ ZLIBOBJS	= $(OBJPATH)adler32.o $(OBJPATH)deflate.o $(OBJPATH)inffast.o \
- 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
- 
-@@ -1483,7 +1483,7 @@ $(LIBNAME):		$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
- 
- $(SLIBNAME):	$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
- 				@./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) \
--					$(STRIP) $(OBJS) $(EXTRAOBJS)
-+					$(STRIP) $(OBJS) $(EXTRAOBJS) -lz
- 
- $(DYLIBNAME):	$(OBJS) $(EXTRAOBJS) $(TESTOBJS)
- 				@$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
--- 
-2.7.3
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-04 17:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-04 17:16 [gentoo-commits] repo/gentoo:master commit in: dev-libs/cryptlib/, dev-libs/cryptlib/files/ Alon Bar-Lev
  -- strict thread matches above, loose matches on Subject: below --
2017-02-05 19:03 Alon Bar-Lev
2016-06-11 12:59 Alon Bar-Lev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox