| 1 |
dragonheart 09/01/31 00:20:57 |
| 2 |
|
| 3 |
Added: cryptlib-3.3.2-external-zlib.patch |
| 4 |
cryptlib-3.3.2-ld.patch |
| 5 |
cryptlib-3.3.2-pthread_yield.patch |
| 6 |
Log: |
| 7 |
version bump to 3.3.2 as per bug #246936 all thanks to Arfrever Frehtes Taifersar Arahesis |
| 8 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/cryptlib/files/cryptlib-3.3.2-external-zlib.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: cryptlib-3.3.2-external-zlib.patch |
| 17 |
=================================================================== |
| 18 |
--- makefile |
| 19 |
+++ makefile |
| 20 |
@@ -241,8 +241,7 @@ |
| 21 |
|
| 22 |
OBJS = $(BNOBJS) $(CERTOBJS) $(CRYPTOBJS) $(CTXOBJS) $(DEVOBJS) \ |
| 23 |
$(ENVOBJS) $(HASHOBJS) $(IOOBJS) $(KEYSETOBJS) $(KRNLOBJS) \ |
| 24 |
- $(LIBOBJS) $(MECHOBJS) $(MISCOBJS) $(SESSOBJS) $(ZLIBOBJS) \ |
| 25 |
- $(OSOBJS) |
| 26 |
+ $(LIBOBJS) $(MECHOBJS) $(MISCOBJS) $(SESSOBJS) $(OSOBJS) |
| 27 |
|
| 28 |
# Object files for the self-test code |
| 29 |
|
| 30 |
@@ -1299,7 +1298,7 @@ |
| 31 |
|
| 32 |
$(SLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) |
| 33 |
@./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) $(OBJS) \ |
| 34 |
- $(EXTRAOBJS) |
| 35 |
+ $(EXTRAOBJS) -lz |
| 36 |
|
| 37 |
$(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS) |
| 38 |
@$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \ |
| 39 |
--- envelope/envelope.h |
| 40 |
+++ envelope/envelope.h |
| 41 |
@@ -17,11 +17,7 @@ |
| 42 |
#endif /* Compiler-specific includes */ |
| 43 |
#endif /* _STREAM_DEFINED */ |
| 44 |
#ifdef USE_COMPRESSION |
| 45 |
- #if defined( INC_ALL ) |
| 46 |
- #include "zlib.h" |
| 47 |
- #else |
| 48 |
- #include "zlib/zlib.h" |
| 49 |
- #endif /* Compiler-specific includes */ |
| 50 |
+ #include <zlib.h> |
| 51 |
#endif /* USE_COMPRESSION */ |
| 52 |
|
| 53 |
/**************************************************************************** |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.1 dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch?rev=1.1&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/cryptlib/files/cryptlib-3.3.2-ld.patch?rev=1.1&content-type=text/plain |
| 61 |
|
| 62 |
Index: cryptlib-3.3.2-ld.patch |
| 63 |
=================================================================== |
| 64 |
--- tools/buildsharedlib.sh |
| 65 |
+++ tools/buildsharedlib.sh |
| 66 |
@@ -115,13 +115,13 @@ |
| 67 |
*) |
| 68 |
if [ `$LD -v 2>&1 | grep -c gcc` -gt 0 -a \ |
| 69 |
`gcc -Wl,-Bsymbolic 2>&1 | grep -c unrecognized` = 0 ] ; then |
| 70 |
- $LD -shared -Wl,-Bsymbolic -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 71 |
+ $LD -shared $LDFLAGS -Wl,-soname,$LIBNAME -Wl,-Bsymbolic -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 72 |
else |
| 73 |
- $LD -shared -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 74 |
+ $LD -shared $LDFLAGS -Wl,-soname,$LIBNAME -o $LIBNAME `cat $LINKFILE` `./tools/getlibs.sh autodetect` ; |
| 75 |
fi |
| 76 |
if [ `which objdump` -a `objdump -p $LIBNAME | grep -c TEXTREL` -gt '0' ] ; then |
| 77 |
echo "Warning: Shared library still contains TEXTREL records." ; |
| 78 |
fi |
| 79 |
- strip $LIBNAME ;; |
| 80 |
+ ;; |
| 81 |
esac |
| 82 |
rm -f $LINKFILE |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.1 dev-libs/cryptlib/files/cryptlib-3.3.2-pthread_yield.patch |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/cryptlib/files/cryptlib-3.3.2-pthread_yield.patch?rev=1.1&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/cryptlib/files/cryptlib-3.3.2-pthread_yield.patch?rev=1.1&content-type=text/plain |
| 90 |
|
| 91 |
Index: cryptlib-3.3.2-pthread_yield.patch |
| 92 |
=================================================================== |
| 93 |
--- kernel/thread.h |
| 94 |
+++ kernel/thread.h |
| 95 |
@@ -1712,7 +1712,7 @@ |
| 96 |
underlying process context should yield the associated thread */ |
| 97 |
#define THREAD_YIELD() yield() |
| 98 |
#else |
| 99 |
- #ifdef __linux__ |
| 100 |
+ #if defined(__linux__) && !defined(__USE_GNU) |
| 101 |
void pthread_yield( void ); |
| 102 |
#endif /* Present but not prototyped unless GNU extensions are enabled */ |
| 103 |
#define THREAD_YIELD() pthread_yield() |
Archives