| 1 |
commit: 11bd7a0e53edb98cd3fb4749a7a4b0e6daaf3578 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 4 17:13:39 2017 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 4 17:16:26 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11bd7a0e |
| 7 |
|
| 8 |
dev-libs/cryptlib: cleanup |
| 9 |
|
| 10 |
Bug: 611502 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
|
| 14 |
dev-libs/cryptlib/Manifest | 2 - |
| 15 |
dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild | 141 --------------------- |
| 16 |
dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild | 132 ------------------- |
| 17 |
dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch | 19 --- |
| 18 |
.../files/cryptlib-3.4.0-external-zlib.patch | 35 ----- |
| 19 |
.../cryptlib/files/cryptlib-3.4.0-python.patch | 50 -------- |
| 20 |
dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch | 54 -------- |
| 21 |
dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch | 55 -------- |
| 22 |
8 files changed, 488 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest |
| 25 |
index 0516966bfe5..c4284aeb356 100644 |
| 26 |
--- a/dev-libs/cryptlib/Manifest |
| 27 |
+++ b/dev-libs/cryptlib/Manifest |
| 28 |
@@ -1,4 +1,2 @@ |
| 29 |
-DIST cl340.zip 5514751 SHA256 fff4cca9e70e579763882cd58bc8a5b36c52c20a7ace6c8b21c5e4e9e05fd9d5 SHA512 b9091ee4ce589f95ce479a0de25c5456db18d955350cc245637addf31f3c03cfe87c971f5a7bff274d17451059d319723cd337cb25a672e0823e29b98b4b87f8 WHIRLPOOL 8965d0c6b0e0bd38d0bbf674a75ac43ea7ea482218c6592d51d0baa7a6ff8673a27c8095084dc7d7cbca39c29bc9acdb6351d6a1f64f6cdc6c1bf906b2579cff |
| 30 |
-DIST cl343.zip 5703258 SHA256 08b104442bb5c7281a3299853d5585cc63bd928454dff3150569c02b957427ad SHA512 abbd53c00be82749f7e359f22cd45ef2b1d90040427457ee8d452d2b513093789b99fa8e904b8a7c75e8db046c59d96e966ce64c2b3630bd21cf3e91b57bc58a WHIRLPOOL 0e1f9dd18172ac9ba244845147e7da41932ea13099aa94957b090be2eb302f179a96bb64c04ddcb74f21cdf5be0c6ed849df4076eb77cbde912719a73ffb1b26 |
| 31 |
DIST cl3431.zip 5828863 SHA256 4a608d725f66669d983083420f9f57f763f320292c50346de3e8c1caeee743bd SHA512 d6a3403361fe39b855ec85b030989c5dfc54e499260869de0de151ad6f62245020561dd308b86edf6792da9663e19a0c0d21c53aa7434b21e83eb4b7445fd8dc WHIRLPOOL eccc446361f7daa9cf5a017ae7e229b2003f198490b9cae1bed61fd7bd585e9a08ec54c6c035ba2c4f3e8a58d3eb9756a61f608d5a299c8cc66b159a87e95874 |
| 32 |
DIST cryptlib-3.4.0-manual.pdf.bz2 1215921 SHA256 b06b736e6e123f578adcd08a8ede6cdb62e3e6d4ac2decb3570def1b29d44da8 SHA512 dbf9914a110a686dc23fedd23c16cefbae12cc67e378db67ac292f8f782b3b615a5819013f2b9c4861086c7ddfab690db9d68a911346102def323255cf48069b WHIRLPOOL 8cc64ab7ffe8a97714e793dd3dfe36708e7e2c7ec583479c593d767de22b860be5bcf0a70427f6f2e7e1d9732ec4ba2d2b3f1617f97bb649c0298924e4a93fb6 |
| 33 |
|
| 34 |
diff --git a/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild |
| 35 |
deleted file mode 100644 |
| 36 |
index 5dfafa07169..00000000000 |
| 37 |
--- a/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,141 +0,0 @@ |
| 40 |
-# Copyright 1999-2015 Gentoo Foundation |
| 41 |
-# Distributed under the terms of the GNU General Public License v2 |
| 42 |
- |
| 43 |
-EAPI=5 |
| 44 |
- |
| 45 |
-PYTHON_COMPAT=( python2_7 pypy ) |
| 46 |
-DISTUTILS_OPTIONAL=1 |
| 47 |
- |
| 48 |
-inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs |
| 49 |
- |
| 50 |
-MY_PV="${PV//.}" |
| 51 |
- |
| 52 |
-DESCRIPTION="Powerful security toolkit for adding encryption to software" |
| 53 |
-HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/" |
| 54 |
-DOC_PREFIX="${PN}-${PV}" |
| 55 |
-SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip |
| 56 |
- doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )" |
| 57 |
- |
| 58 |
-LICENSE="Sleepycat" |
| 59 |
-KEYWORDS="amd64 x86" |
| 60 |
-SLOT="0" |
| 61 |
-IUSE="doc ldap odbc python" |
| 62 |
- |
| 63 |
-S="${WORKDIR}" |
| 64 |
- |
| 65 |
-RDEPEND="sys-libs/zlib |
| 66 |
- ldap? ( net-nds/openldap ) |
| 67 |
- odbc? ( dev-db/unixODBC ) |
| 68 |
- python? ( ${PYTHON_DEPS} )" |
| 69 |
-DEPEND="${RDEPEND} |
| 70 |
- app-arch/unzip" |
| 71 |
- |
| 72 |
-src_unpack() { |
| 73 |
- # we need the -a option, so we can not use 'unpack' |
| 74 |
- unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" |
| 75 |
- use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2" |
| 76 |
-} |
| 77 |
- |
| 78 |
-wrap_python() { |
| 79 |
- if use python; then |
| 80 |
- # cd bindings || die |
| 81 |
- |
| 82 |
- distutils-r1_${1} |
| 83 |
- fi |
| 84 |
-} |
| 85 |
- |
| 86 |
-src_prepare() { |
| 87 |
- rm -fr zlib |
| 88 |
- |
| 89 |
- # we want our own CFLAGS ;-) |
| 90 |
- sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \ |
| 91 |
- -e "s:-O3::g" -e "s:-O4::g" makefile || die "sed makefile failed" |
| 92 |
- sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e "s/-mcpu=[[:alnum:]\.=-]*//g" \ |
| 93 |
- -e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed tools/ccopts.sh failed" |
| 94 |
- |
| 95 |
- # change 'make' to '$(MAKE)' |
| 96 |
- sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed" |
| 97 |
- |
| 98 |
- # NOTICE: |
| 99 |
- # Because of stack execution |
| 100 |
- # assembly parts are disabled. |
| 101 |
- sed -i -e 's:i\[3,4,5,6\]86:___:g' makefile || die "sed makefile failed" |
| 102 |
- |
| 103 |
- # Fix version number of shared library. |
| 104 |
- sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed" |
| 105 |
- |
| 106 |
- # Respect LDFLAGS and fix soname and strip issues. |
| 107 |
- epatch "${FILESDIR}/${PN}-3.3.2-ld.patch" |
| 108 |
- |
| 109 |
- # Use external zlib. |
| 110 |
- epatch "${FILESDIR}/${PN}-3.4.0-external-zlib.patch" |
| 111 |
- |
| 112 |
- # Fix setup.py |
| 113 |
- epatch "${FILESDIR}"/${P}-python.patch |
| 114 |
- |
| 115 |
- # For some reason, setup.py is half-designed to be run from proper dir, |
| 116 |
- # and half-designed to be run from root. Since the patch fixes it to |
| 117 |
- # be completely from root, move it. |
| 118 |
- # |
| 119 |
- # When bumping the package, please update the patch to make setup.py work |
| 120 |
- # properly when executed from 'bindings' subdirectory. |
| 121 |
- mv bindings/setup.py . || die |
| 122 |
- |
| 123 |
- wrap_python ${FUNCNAME} |
| 124 |
-} |
| 125 |
- |
| 126 |
-src_compile() { |
| 127 |
- local libname="libcl.so.${PV}" |
| 128 |
- |
| 129 |
- # At least -O2 is needed. |
| 130 |
- replace-flags -O -O2 |
| 131 |
- replace-flags -O0 -O2 |
| 132 |
- replace-flags -O1 -O2 |
| 133 |
- replace-flags -Os -O2 |
| 134 |
- is-flagq -O* || append-flags -O2 |
| 135 |
- |
| 136 |
- append-flags "-D__UNIX__ -DOSVERSION=2 -DNDEBUG -I." |
| 137 |
- |
| 138 |
- if [ -f /usr/include/pthread.h -a \ |
| 139 |
- `grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then |
| 140 |
- append-flags "-DHAS_RECURSIVE_MUTEX" |
| 141 |
- fi |
| 142 |
- if [ -f /usr/include/pthread.h -a \ |
| 143 |
- `grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then |
| 144 |
- append-flags "-DHAS_ROBUST_MUTEX" |
| 145 |
- fi |
| 146 |
- |
| 147 |
- use ldap && append-flags -DHAS_LDAP |
| 148 |
- use odbc && append-flags -DHAS_ODBC |
| 149 |
- |
| 150 |
- emake directories || die |
| 151 |
- emake toolscripts || die |
| 152 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c" Linux || die "emake static failed" |
| 153 |
- |
| 154 |
- emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \ |
| 155 |
- CFLAGS="${CFLAGS} -fPIC -c" Linux |
| 156 |
- |
| 157 |
- if use python; then |
| 158 |
- ln -s libcl.so.${PV} libcl.so || die |
| 159 |
- |
| 160 |
- # Python bindings don't work with -O2 and higher. |
| 161 |
- replace-flags -O* -O1 |
| 162 |
- |
| 163 |
- wrap_python ${FUNCNAME} |
| 164 |
- fi |
| 165 |
-} |
| 166 |
- |
| 167 |
-src_install() { |
| 168 |
- dolib.so "libcl.so.${PV}" |
| 169 |
- dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so" |
| 170 |
- dolib.a "libcl.a" |
| 171 |
- |
| 172 |
- doheader cryptlib.h |
| 173 |
- |
| 174 |
- dodoc README |
| 175 |
- if use doc; then |
| 176 |
- newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf" |
| 177 |
- fi |
| 178 |
- |
| 179 |
- wrap_python ${FUNCNAME} |
| 180 |
-} |
| 181 |
|
| 182 |
diff --git a/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild |
| 183 |
deleted file mode 100644 |
| 184 |
index d49963ee693..00000000000 |
| 185 |
--- a/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild |
| 186 |
+++ /dev/null |
| 187 |
@@ -1,132 +0,0 @@ |
| 188 |
-# Copyright 1999-2016 Gentoo Foundation |
| 189 |
-# Distributed under the terms of the GNU General Public License v2 |
| 190 |
- |
| 191 |
-EAPI=6 |
| 192 |
- |
| 193 |
-PYTHON_COMPAT=( python2_7 pypy ) |
| 194 |
-DISTUTILS_OPTIONAL=1 |
| 195 |
- |
| 196 |
-inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs versionator |
| 197 |
- |
| 198 |
-MY_PV="${PV//.}" |
| 199 |
- |
| 200 |
-DESCRIPTION="Powerful security toolkit for adding encryption to software" |
| 201 |
-HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/" |
| 202 |
-DOC_PREFIX="${PN}-$(get_version_component_range 1-2 ${PV}).0" |
| 203 |
-SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip |
| 204 |
- doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )" |
| 205 |
- |
| 206 |
-LICENSE="Sleepycat" |
| 207 |
-KEYWORDS="~amd64 ~x86" |
| 208 |
-SLOT="0" |
| 209 |
-IUSE="doc ldap odbc python" |
| 210 |
- |
| 211 |
-S="${WORKDIR}" |
| 212 |
- |
| 213 |
-RDEPEND="sys-libs/zlib |
| 214 |
- ldap? ( net-nds/openldap ) |
| 215 |
- odbc? ( dev-db/unixODBC ) |
| 216 |
- python? ( ${PYTHON_DEPS} )" |
| 217 |
-DEPEND="${RDEPEND} |
| 218 |
- app-arch/unzip" |
| 219 |
- |
| 220 |
-PATCHES=( |
| 221 |
- "${FILESDIR}/${P}-build.patch" |
| 222 |
- "${FILESDIR}/${P}-zlib.patch" |
| 223 |
-) |
| 224 |
- |
| 225 |
-src_unpack() { |
| 226 |
- # we need the -a option, so we can not use 'unpack' |
| 227 |
- unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die |
| 228 |
- use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2" |
| 229 |
-} |
| 230 |
- |
| 231 |
-wrap_python() { |
| 232 |
- if use python; then |
| 233 |
- cd bindings || die |
| 234 |
- distutils-r1_${1} |
| 235 |
- fi |
| 236 |
-} |
| 237 |
- |
| 238 |
-src_prepare() { |
| 239 |
- default |
| 240 |
- |
| 241 |
- rm -fr zlib || die |
| 242 |
- |
| 243 |
- # we want our own CFLAGS ;-) |
| 244 |
- sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \ |
| 245 |
- -e "s:-O3::g" -e "s:-O4::g" makefile || die "sed makefile failed" |
| 246 |
- sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e "s/-mcpu=[[:alnum:]\.=-]*//g" \ |
| 247 |
- -e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed tools/ccopts.sh failed" |
| 248 |
- |
| 249 |
- # change 'make' to '$(MAKE)' |
| 250 |
- sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed" |
| 251 |
- |
| 252 |
- # NOTICE: |
| 253 |
- # Because of stack execution |
| 254 |
- # assembly parts are disabled. |
| 255 |
- sed -i -e 's:i\[3,4,5,6\]86:___:g' makefile || die "sed makefile failed" |
| 256 |
- |
| 257 |
- # Fix version number of shared library. |
| 258 |
- sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed" |
| 259 |
- |
| 260 |
- wrap_python ${FUNCNAME} |
| 261 |
-} |
| 262 |
- |
| 263 |
-src_compile() { |
| 264 |
- local libname="libcl.so.${PV}" |
| 265 |
- |
| 266 |
- # At least -O2 is needed. |
| 267 |
- replace-flags -O -O2 |
| 268 |
- replace-flags -O0 -O2 |
| 269 |
- replace-flags -O1 -O2 |
| 270 |
- replace-flags -Os -O2 |
| 271 |
- is-flagq -O* || append-flags -O2 |
| 272 |
- |
| 273 |
- append-flags "-fPIC" |
| 274 |
- append-cppflags "-D__UNIX__ -DOSVERSION=2 -DNDEBUG -I." |
| 275 |
- |
| 276 |
- if [ -f /usr/include/pthread.h -a \ |
| 277 |
- `grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then |
| 278 |
- append-cppflags "-DHAS_RECURSIVE_MUTEX" |
| 279 |
- fi |
| 280 |
- if [ -f /usr/include/pthread.h -a \ |
| 281 |
- `grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then |
| 282 |
- append-cppflags "-DHAS_ROBUST_MUTEX" |
| 283 |
- fi |
| 284 |
- |
| 285 |
- use ldap && append-cppflags -DHAS_LDAP |
| 286 |
- use odbc && append-cppflags -DHAS_ODBC |
| 287 |
- |
| 288 |
- emake directories |
| 289 |
- emake toolscripts |
| 290 |
- emake CC="$(tc-getCC)" CFLAGS="${CPPFLAGS} ${CFLAGS} -c" STRIP=true Linux |
| 291 |
- |
| 292 |
- emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \ |
| 293 |
- CFLAGS="${CPPFLAGS} ${CFLAGS} -c" STRIP=true Linux |
| 294 |
- |
| 295 |
- if use python; then |
| 296 |
- # Without this python will link against the static lib |
| 297 |
- ln -s libcl.so.${PV} libcl.so || die |
| 298 |
- |
| 299 |
- # Python bindings don't work with -O2 and higher. |
| 300 |
- replace-flags -O* -O1 |
| 301 |
- |
| 302 |
- wrap_python ${FUNCNAME} |
| 303 |
- fi |
| 304 |
-} |
| 305 |
- |
| 306 |
-src_install() { |
| 307 |
- dolib.so "libcl.so.${PV}" |
| 308 |
- dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so" |
| 309 |
- dolib.a "libcl.a" |
| 310 |
- |
| 311 |
- doheader cryptlib.h |
| 312 |
- |
| 313 |
- dodoc README |
| 314 |
- if use doc; then |
| 315 |
- newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf" |
| 316 |
- fi |
| 317 |
- |
| 318 |
- wrap_python ${FUNCNAME} |
| 319 |
-} |
| 320 |
|
| 321 |
diff --git a/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch b/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch |
| 322 |
deleted file mode 100644 |
| 323 |
index e54f88fc3c7..00000000000 |
| 324 |
--- a/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch |
| 325 |
+++ /dev/null |
| 326 |
@@ -1,19 +0,0 @@ |
| 327 |
---- tools/buildsharedlib.sh |
| 328 |
-+++ tools/buildsharedlib.sh |
| 329 |
-@@ -115,13 +115,13 @@ |
| 330 |
- *) |
| 331 |
- if [ `$LD -v 2>&1 | grep -c gcc` -gt 0 -a \ |
| 332 |
- `gcc -Wl,-Bsymbolic 2>&1 | grep -c unrecognized` = 0 ] ; then |
| 333 |
-- $LD -shared -Wl,-Bsymbolic -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 334 |
-+ $LD -shared $LDFLAGS -Wl,-soname,$LIBNAME -Wl,-Bsymbolic -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 335 |
- else |
| 336 |
-- $LD -shared -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 337 |
-+ $LD -shared $LDFLAGS -Wl,-soname,$LIBNAME -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 338 |
- fi |
| 339 |
- if [ `which objdump` -a `objdump -p $LIBNAME | grep -c TEXTREL` -gt '0' ] ; then |
| 340 |
- echo "Warning: Shared library still contains TEXTREL records." ; |
| 341 |
- fi |
| 342 |
-- strip $LIBNAME ;; |
| 343 |
-+ ;; |
| 344 |
- esac |
| 345 |
- rm -f $LINKFILE |
| 346 |
|
| 347 |
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 |
| 348 |
deleted file mode 100644 |
| 349 |
index 5b599b76294..00000000000 |
| 350 |
--- a/dev-libs/cryptlib/files/cryptlib-3.4.0-external-zlib.patch |
| 351 |
+++ /dev/null |
| 352 |
@@ -1,35 +0,0 @@ |
| 353 |
---- makefile 2011-01-18 14:23:05.000000000 -0500 |
| 354 |
-+++ makefile.new 2011-01-18 14:25:47.000000000 -0500 |
| 355 |
-@@ -259,7 +259,7 @@ |
| 356 |
- OBJS = $(BNOBJS) $(CERTOBJS) $(CRYPTOBJS) $(CTXOBJS) $(DEVOBJS) \ |
| 357 |
- $(ENCDECOBJS) $(ENVOBJS) $(HASHOBJS) $(IOOBJS) $(KEYSETOBJS) \ |
| 358 |
- $(KRNLOBJS) $(LIBOBJS) $(MECHOBJS) $(MISCOBJS) $(SESSOBJS) \ |
| 359 |
-- $(ZLIBOBJS) $(OSOBJS) |
| 360 |
-+ $(OSOBJS) |
| 361 |
- |
| 362 |
- # Object files for the self-test code |
| 363 |
- |
| 364 |
-@@ -1477,7 +1477,7 @@ |
| 365 |
- |
| 366 |
- $(SLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) |
| 367 |
- @./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) $(OBJS) \ |
| 368 |
-- $(EXTRAOBJS) |
| 369 |
-+ $(EXTRAOBJS) -lz |
| 370 |
- |
| 371 |
- $(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) |
| 372 |
- @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \ |
| 373 |
---- envelope/envelope.h 2010-12-14 23:16:40.000000000 -0500 |
| 374 |
-+++ envelope.h.new 2011-01-18 14:28:06.000000000 -0500 |
| 375 |
-@@ -17,11 +17,7 @@ |
| 376 |
- #endif /* Compiler-specific includes */ |
| 377 |
- #endif /* _STREAM_DEFINED */ |
| 378 |
- #ifdef USE_COMPRESSION |
| 379 |
-- #if defined( INC_ALL ) |
| 380 |
-- #include "zlib.h" |
| 381 |
-- #else |
| 382 |
-- #include "zlib/zlib.h" |
| 383 |
-- #endif /* Compiler-specific includes */ |
| 384 |
-+ #include <zlib.h> |
| 385 |
- #endif /* USE_COMPRESSION */ |
| 386 |
- |
| 387 |
- /**************************************************************************** |
| 388 |
|
| 389 |
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.0-python.patch b/dev-libs/cryptlib/files/cryptlib-3.4.0-python.patch |
| 390 |
deleted file mode 100644 |
| 391 |
index e7aa4137649..00000000000 |
| 392 |
--- a/dev-libs/cryptlib/files/cryptlib-3.4.0-python.patch |
| 393 |
+++ /dev/null |
| 394 |
@@ -1,50 +0,0 @@ |
| 395 |
---- bindings/setup.py 2010-12-13 04:51:58.000000000 -0500 |
| 396 |
-+++ setup.py.new 2011-01-19 08:41:40.000000000 -0500 |
| 397 |
-@@ -15,7 +15,7 @@ |
| 398 |
- ext = Extension("cryptlib_py", |
| 399 |
- sources=["bindings/python.c"], |
| 400 |
-- library_dirs=['..'], |
| 401 |
-+ library_dirs=['.'], |
| 402 |
-- libraries=['cl']) |
| 403 |
-+ libraries=['cl','resolv']) |
| 404 |
- |
| 405 |
- setup(name="cryptlib_py", ext_modules=[ext]) |
| 406 |
- |
| 407 |
---- bindings/python.c 2010-11-30 18:35:52.000000000 -0500 |
| 408 |
-+++ python.c.new 2011-01-19 09:05:43.000000000 -0500 |
| 409 |
-@@ -358,6 +358,7 @@ |
| 410 |
- return(processStatus(status)); |
| 411 |
- } |
| 412 |
- |
| 413 |
-+/* |
| 414 |
- static PyObject* python_cryptGenerateKeyAsync(PyObject* self, PyObject* args) |
| 415 |
- { |
| 416 |
- int status = 0; |
| 417 |
-@@ -396,6 +397,7 @@ |
| 418 |
- |
| 419 |
- return(processStatus(status)); |
| 420 |
- } |
| 421 |
-+*/ |
| 422 |
- |
| 423 |
- static PyObject* python_cryptEncrypt(PyObject* self, PyObject* args) |
| 424 |
- { |
| 425 |
-@@ -1429,9 +1431,9 @@ |
| 426 |
- { "cryptDestroyContext", python_cryptDestroyContext, METH_VARARGS }, |
| 427 |
- { "cryptDestroyObject", python_cryptDestroyObject, METH_VARARGS }, |
| 428 |
- { "cryptGenerateKey", python_cryptGenerateKey, METH_VARARGS }, |
| 429 |
-- { "cryptGenerateKeyAsync", python_cryptGenerateKeyAsync, METH_VARARGS }, |
| 430 |
-- { "cryptAsyncQuery", python_cryptAsyncQuery, METH_VARARGS }, |
| 431 |
-- { "cryptAsyncCancel", python_cryptAsyncCancel, METH_VARARGS }, |
| 432 |
-+// { "cryptGenerateKeyAsync", python_cryptGenerateKeyAsync, METH_VARARGS }, |
| 433 |
-+// { "cryptAsyncQuery", python_cryptAsyncQuery, METH_VARARGS }, |
| 434 |
-+// { "cryptAsyncCancel", python_cryptAsyncCancel, METH_VARARGS }, |
| 435 |
- { "cryptEncrypt", python_cryptEncrypt, METH_VARARGS }, |
| 436 |
- { "cryptDecrypt", python_cryptDecrypt, METH_VARARGS }, |
| 437 |
- { "cryptSetAttribute", python_cryptSetAttribute, METH_VARARGS }, |
| 438 |
-@@ -4892,4 +4894,4 @@ |
| 439 |
- v = Py_BuildValue("i", -50); |
| 440 |
- PyDict_SetItemString(moduleDict, "CRYPT_ENVELOPE_RESOURCE", v); |
| 441 |
- Py_DECREF(v); /* Need resource to proceed */ |
| 442 |
--} |
| 443 |
-\ No newline at end of file |
| 444 |
-+} |
| 445 |
|
| 446 |
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch b/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch |
| 447 |
deleted file mode 100644 |
| 448 |
index 89a3a920c17..00000000000 |
| 449 |
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3-build.patch |
| 450 |
+++ /dev/null |
| 451 |
@@ -1,54 +0,0 @@ |
| 452 |
-From 58d3e56f59e0e8d48d913c217929b35e9366e829 Mon Sep 17 00:00:00 2001 |
| 453 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 454 |
-Date: Sat, 11 Jun 2016 15:07:12 +0300 |
| 455 |
-Subject: [PATCH] build: so: support LDFLAGS and SONAME |
| 456 |
- |
| 457 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 458 |
---- |
| 459 |
- tools/buildsharedlib.sh | 4 ++-- |
| 460 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 461 |
- |
| 462 |
-diff --git a/tools/buildsharedlib.sh b/tools/buildsharedlib.sh |
| 463 |
-index f1277a7..59c4713 100644 |
| 464 |
---- a/tools/buildsharedlib.sh |
| 465 |
-+++ b/tools/buildsharedlib.sh |
| 466 |
-@@ -131,9 +131,9 @@ case $OSNAME in |
| 467 |
- *) |
| 468 |
- if [ `$LD -v 2>&1 | grep -c gcc` -gt 0 -a \ |
| 469 |
- `gcc -Wl,-Bsymbolic 2>&1 | grep -c unrecognized` = 0 ] ; then |
| 470 |
-- $LD -shared -Wl,-Bsymbolic -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 471 |
-+ $LD -shared $LDFLAGS -Wl,-soname,$LIBNAME -Wl,-Bsymbolic -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 472 |
- else |
| 473 |
-- $LD -shared -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 474 |
-+ $LD -shared -shared $LDFLAGS -Wl,-soname,$LIBNAME -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 475 |
- fi |
| 476 |
- if [ `which objdump` -a `objdump -p $LIBNAME | grep -c TEXTREL` -gt '0' ] ; then |
| 477 |
- echo "Warning: Shared library still contains TEXTREL records." ; |
| 478 |
--- |
| 479 |
-2.7.3 |
| 480 |
- |
| 481 |
-From b11541f4beaf8395dd90de53b57933661e120b0a Mon Sep 17 00:00:00 2001 |
| 482 |
-From: Dennis Schridde <devurandom@×××.net> |
| 483 |
-Date: Sat, 11 Jun 2016 15:34:57 +0300 |
| 484 |
-Subject: [PATCH] build: ignore DL_EXPORT on non windows |
| 485 |
- |
| 486 |
-Signed-off-by: Dennis Schridde <devurandom@×××.net> |
| 487 |
---- |
| 488 |
- cryptlib.h | 1 + |
| 489 |
- 1 file changed, 1 insertion(+) |
| 490 |
- |
| 491 |
-diff --git a/cryptlib.h b/cryptlib.h |
| 492 |
-index 61cf338..4738852 100644 |
| 493 |
---- a/cryptlib.h |
| 494 |
-+++ b/cryptlib.h |
| 495 |
-@@ -122,6 +122,7 @@ |
| 496 |
- #define C_CHR char |
| 497 |
- #define C_STR C_CHR * |
| 498 |
- #define C_RET int |
| 499 |
-+ #define DL_EXPORT(type) type |
| 500 |
- #endif /* Windows vs.everything else function types */ |
| 501 |
- |
| 502 |
- /* Symbolic defines to make it clearer how the function parameters behave */ |
| 503 |
--- |
| 504 |
-2.7.3 |
| 505 |
- |
| 506 |
|
| 507 |
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch b/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch |
| 508 |
deleted file mode 100644 |
| 509 |
index 26c723c7940..00000000000 |
| 510 |
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3-zlib.patch |
| 511 |
+++ /dev/null |
| 512 |
@@ -1,55 +0,0 @@ |
| 513 |
-From 70b00d882e9ff1e17bb82b3e722def0b71f2374a Mon Sep 17 00:00:00 2001 |
| 514 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 515 |
-Date: Sat, 11 Jun 2016 15:15:25 +0300 |
| 516 |
-Subject: [PATCH 2/2] build: use system zlib |
| 517 |
- |
| 518 |
-this should be a toggle of build system not hard coded. |
| 519 |
- |
| 520 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 521 |
---- |
| 522 |
- envelope/envelope.h | 6 +----- |
| 523 |
- makefile | 4 ++-- |
| 524 |
- 2 files changed, 3 insertions(+), 7 deletions(-) |
| 525 |
- |
| 526 |
-diff --git a/envelope/envelope.h b/envelope/envelope.h |
| 527 |
-index 028f4b2..4ef6b20 100644 |
| 528 |
---- a/envelope/envelope.h |
| 529 |
-+++ b/envelope/envelope.h |
| 530 |
-@@ -17,11 +17,7 @@ |
| 531 |
- #endif /* Compiler-specific includes */ |
| 532 |
- #endif /* _STREAM_DEFINED */ |
| 533 |
- #ifdef USE_COMPRESSION |
| 534 |
-- #if defined( INC_ALL ) |
| 535 |
-- #include "zlib.h" |
| 536 |
-- #else |
| 537 |
-- #include "zlib/zlib.h" |
| 538 |
-- #endif /* Compiler-specific includes */ |
| 539 |
-+ #include <zlib.h> |
| 540 |
- #endif /* USE_COMPRESSION */ |
| 541 |
- |
| 542 |
- /**************************************************************************** |
| 543 |
-diff --git a/makefile b/makefile |
| 544 |
-index c762d02..24c180a 100644 |
| 545 |
---- a/makefile |
| 546 |
-+++ b/makefile |
| 547 |
-@@ -283,7 +283,7 @@ ZLIBOBJS = $(OBJPATH)adler32.o $(OBJPATH)deflate.o $(OBJPATH)inffast.o \ |
| 548 |
- OBJS = $(BNOBJS) $(CERTOBJS) $(CRYPTOBJS) $(CTXOBJS) $(DEVOBJS) \ |
| 549 |
- $(ENCDECOBJS) $(ENVOBJS) $(HASHOBJS) $(IOOBJS) $(KEYSETOBJS) \ |
| 550 |
- $(KRNLOBJS) $(LIBOBJS) $(MECHOBJS) $(MISCOBJS) $(SESSOBJS) \ |
| 551 |
-- $(ZLIBOBJS) $(OSOBJS) |
| 552 |
-+ $(OSOBJS) |
| 553 |
- |
| 554 |
- # Object files for the self-test code |
| 555 |
- |
| 556 |
-@@ -1483,7 +1483,7 @@ $(LIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) |
| 557 |
- |
| 558 |
- $(SLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) |
| 559 |
- @./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) \ |
| 560 |
-- $(STRIP) $(OBJS) $(EXTRAOBJS) |
| 561 |
-+ $(STRIP) $(OBJS) $(EXTRAOBJS) -lz |
| 562 |
- |
| 563 |
- $(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) |
| 564 |
- @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \ |
| 565 |
--- |
| 566 |
-2.7.3 |
| 567 |
- |
Archives