diff options
author | Dane Smith <smithdanea@gmail.com> | 2011-01-20 10:55:55 -0500 |
---|---|---|
committer | Dane Smith <smithdanea@gmail.com> | 2011-01-20 10:55:55 -0500 |
commit | 61c8ffe40ea0e94278b669db4fbdaf66b0cbb9df (patch) | |
tree | ecaa2458095661ebee774ecd0ee18651990210b1 /dev-libs | |
parent | Take 5. Yay python. (diff) | |
download | c1pher-61c8ffe40ea0e94278b669db4fbdaf66b0cbb9df.tar.gz c1pher-61c8ffe40ea0e94278b669db4fbdaf66b0cbb9df.tar.bz2 c1pher-61c8ffe40ea0e94278b669db4fbdaf66b0cbb9df.zip |
Remove cryptlib testing.
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/cryptlib/ChangeLog | 142 | ||||
-rw-r--r-- | dev-libs/cryptlib/Manifest | 12 | ||||
-rw-r--r-- | dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild | 128 | ||||
-rw-r--r-- | dev-libs/cryptlib/cryptlib-3.4.0.ebuild | 129 | ||||
-rw-r--r-- | dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch | 36 | ||||
-rw-r--r-- | dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch | 19 | ||||
-rw-r--r-- | dev-libs/cryptlib/files/cryptlib-3.4.0-external-zlib.patch | 35 | ||||
-rw-r--r-- | dev-libs/cryptlib/files/cryptlib-3.4.0-python.patch | 50 | ||||
-rw-r--r-- | dev-libs/cryptlib/metadata.xml | 6 |
9 files changed, 0 insertions, 557 deletions
diff --git a/dev-libs/cryptlib/ChangeLog b/dev-libs/cryptlib/ChangeLog deleted file mode 100644 index 853f6c5..0000000 --- a/dev-libs/cryptlib/ChangeLog +++ /dev/null @@ -1,142 +0,0 @@ -# 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 $ - - 28 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -cryptlib-3.3.3.ebuild: - Delete. - - 17 Nov 2010; Markus Meier <maekke@gentoo.org> cryptlib-3.3.3-r1.ebuild: - x86 stable, bug #345489 - - 15 Nov 2010; Markos Chandras <hwoarang@gentoo.org> - cryptlib-3.3.3-r1.ebuild: - Stable on amd64 wrt bug #345489 - - 15 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org> - cryptlib-3.3.3-r1.ebuild: - Fix obvious typo, as reported by Andrey Grozin in bug #341119 - -*cryptlib-3.3.3-r1 (13 Oct 2010) - - 13 Oct 2010; Dane Smith <c1pher@gentoo.org> +cryptlib-3.3.3-r1.ebuild: - Revision bump. Address the QA issues wrt bugs #298461 and bug #330289. - Also - contains some cosmetic fixes. - - 04 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - cryptlib-3.3.3.ebuild: - Set PYTHON_DEPEND. Unset DISTUTILS_DISABLE_PYTHON_DEPENDENCY. - - 17 Jan 2010; Ulrich Mueller <ulm@gentoo.org> cryptlib-3.3.2.ebuild, - cryptlib-3.3.3.ebuild: - Fix LICENSE, bug 300426. - - 31 Dec 2009; Christian Faulhammer <fauli@gentoo.org> - cryptlib-3.3.3.ebuild: - stable x86, bug 287622 - - 26 Dec 2009; Pacho Ramos <pacho@gentoo.org> cryptlib-3.3.3.ebuild: - amd64 stable, bug 287622 - -*cryptlib-3.3.3 (25 Oct 2009) - - 25 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -cryptlib-3.3.0-r1.ebuild, -files/cryptlib-3.3.0-ld.patch, - -cryptlib-3.3.1.ebuild, +cryptlib-3.3.3.ebuild: - Version bump. Optionally build Python bindings which were previously built - in dev-python/cryptlib_py. Filter some flags for Python bindings (bug #268947). - -*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) - - 16 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org> +cryptlib-3.3.1.ebuild: - Version bump - -*cryptlib-3.3.0-r1 (05 Feb 2007) - - 05 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org> -cryptlib-3.2.ebuild, - -cryptlib-3.2.1.ebuild, -cryptlib-3.2.2.ebuild, -cryptlib-3.3.0.ebuild, - +cryptlib-3.3.0-r1.ebuild: - Removed USE static, bug#165371 requested by jakub. - Fixed QA issues. - Cleanup old packages. - -*cryptlib-3.3.0 (22 Oct 2006) - - 22 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org> - +files/cryptlib-3.3.0-ld.patch, +cryptlib-3.3.0.ebuild: - Version bump, fixed QA issues by removing assembly parts, adds odbc use flag - (Thanks to Daniel Plaza), closes bug#105954. - -*cryptlib-3.2.2 (02 Nov 2005) - - 02 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org> - +cryptlib-3.2.2.ebuild: - version bump, general ebuild cleanup, optional manual is now uploaded to - gentoo-mirrors (original had no version tag), added ~amd64 (compiles fine - and seems to work). - -*cryptlib-3.2.1 (20 Aug 2005) - - 20 Aug 2005; Daniel Black <dragonheart@gentoo.org> - -cryptlib-3.1_beta05.ebuild, -cryptlib-3.1.ebuild, cryptlib-3.2.ebuild, - +cryptlib-3.2.1.ebuild: - added shared library symlink (bug #101780 thanks to Daniel Plaza.version - bump and old version cleanout also - -*cryptlib-3.2 (17 Jun 2005) - - 17 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> cryptlib-3.1.ebuild, - +cryptlib-3.2.ebuild: - Version bump. QA: add missing doc to IUSE. - - 17 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> cryptlib-3.1.ebuild, - cryptlib-3.1_beta05.ebuild: - Bug #69831: Ensure unzip is in DEPEND. - - 22 Jan 2005; Daniel Black <dragonheart@gentoo.org> cryptlib-3.1.ebuild, - cryptlib-3.1_beta05.ebuild: - 3.1_beta05 no longer mirrored upstream. Changed to fetch the right - documentation as per bug #78971 by Alexander Rittler <alexr@upb.de>. - -*cryptlib-3.1 (04 Nov 2004) - - 04 Nov 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml, - -cryptlib-3.0.ebuild, +cryptlib-3.1.ebuild, -cryptlib-3.1_beta04.ebuild, - cryptlib-3.1_beta05.ebuild, metadata.xml: - Removed old versions. Version bump as per bug #69986. Replace use with useq. - Added app-arch/zip dependancy as per bug #69831. Thanks to Blake Ramsdell - <blake@sendmail.com> and Alexandru Toma <flash3001@yahoo.com> respectively. - Metadata added for crypto herd. - - 03 Jun 2004; Aron Griffis <agriffis@gentoo.org> cryptlib-3.0.ebuild, - cryptlib-3.1_beta04.ebuild, cryptlib-3.1_beta05.ebuild: - Fix use invocation - -*cryptlib-3.1_beta05 (09 Oct 2003) - - 09 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> - cryptlib-3.1_beta05.ebuild: - version bump - - 09 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> - cryptlib-3.1_beta04.ebuild: - tidy; more error messages; actually install the manual if USE=doc - -*cryptlib-3.1_beta04 (13 Jun 2003) - - 13 Jun 2003; Mike Frysinger <vapier@gentoo.org> : - Initial import. Ebuild submitted by me. - -*cryptlib-3.0 (13 Jun 2003) - - 13 Jun 2003; Mike Frysinger <vapier@gentoo.org> : - Initial import. Ebuild submitted by me. diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest deleted file mode 100644 index dea800d..0000000 --- a/dev-libs/cryptlib/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -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 3479 RMD160 0d5b5c7bfebef5b5f434e28f846423dcb956c19b SHA1 1fd7f274a5de5764fb48596266efeef0582f6c55 SHA256 62399309c9bb34a8ad4ec0180042dee59e21465f3feaa10b8f1950fd6dad851b -EBUILD cryptlib-3.4.0.ebuild 3497 RMD160 ce76eff5edcfd2d1d0b8c45d3922f4d9dc3c2c15 SHA1 e20ff6235a8d57c60047a4829e1b31d475efad8c SHA256 10235f2912e5882367c8691b6c707d0034b6839a1e8fc3524e508547a8a06c41 -MISC ChangeLog 5111 RMD160 c1ad631bbfeb6ddcfddcf48c77baf54af6e97b85 SHA1 66f4ba9dbc0b2b1b8e40f2546956bd5893129d57 SHA256 ce31f17d90af86c9adf395875b70b7e4af7744337e51a4e5eb698fc76401d8b9 -MISC metadata.xml 217 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 SHA1 d899a6870ab5af7dfe496ae91441fb7c103556a9 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759 diff --git a/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild deleted file mode 100644 index 602ee1e..0000000 --- a/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild,v 1.4 2010/11/17 10:56:12 maekke Exp $ - -EAPI="2" -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils eutils flag-o-matic multilib toolchain-funcs versionator - -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}-${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="" -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" -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.3.2-external-zlib.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 - - cd bindings - 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 - pushd bindings > /dev/null - distutils_src_install - popd > /dev/null - fi - - dodoc README || die - if use doc; then - newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf" || die - fi -} diff --git a/dev-libs/cryptlib/cryptlib-3.4.0.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0.ebuild deleted file mode 100644 index bb985a3..0000000 --- a/dev-libs/cryptlib/cryptlib-3.4.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.3-r1.ebuild,v 1.4 2010/11/17 10:56:12 maekke 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.3.2-external-zlib.patch b/dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch deleted file mode 100644 index dcff438..0000000 --- a/dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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 deleted file mode 100644 index e54f88f..0000000 --- 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 5b599b7..0000000 --- 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 e7aa413..0000000 --- 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/metadata.xml b/dev-libs/cryptlib/metadata.xml deleted file mode 100644 index 19fd3de..0000000 --- a/dev-libs/cryptlib/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>crypto</herd> -<maintainer><email>crypto@gentoo.org</email></maintainer> -</pkgmetadata> |