| 1 |
vapier 08/06/21 05:36:55 |
| 2 |
|
| 3 |
Added: openssl-0.9.8h-ldflags.patch |
| 4 |
openssl-0.9.8h-pkcs12.patch |
| 5 |
Log: |
| 6 |
Respect LDFLAGS #181438 by Arfrever Frehtes Taifersar Arahesis and add fix from upstream for PKCS12 troubles #224843 by Per Pomsel. |
| 7 |
(Portage version: 2.2_pre8/cvs/Linux 2.6.25 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: openssl-0.9.8h-ldflags.patch |
| 16 |
=================================================================== |
| 17 |
http://bugs.gentoo.org/181438 |
| 18 |
|
| 19 |
make sure we respect LDFLAGS |
| 20 |
|
| 21 |
--- openssl-0.9.8h/Makefile |
| 22 |
+++ openssl-0.9.8h/Makefile |
| 23 |
@@ -180,6 +181,7 @@ |
| 24 |
MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \ |
| 25 |
DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}' \ |
| 26 |
MAKEDEPPROG='${MAKEDEPPROG}' \ |
| 27 |
+ LDFLAGS='${LDFLAGS}' \ |
| 28 |
SHARED_LDFLAGS='${SHARED_LDFLAGS}' \ |
| 29 |
KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' \ |
| 30 |
EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' \ |
| 31 |
--- openssl-0.9.8h/Makefile.shared |
| 32 |
+++ openssl-0.9.8h/Makefile.shared |
| 33 |
@@ -153,7 +153,7 @@ |
| 34 |
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ |
| 35 |
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" |
| 36 |
|
| 37 |
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" |
| 38 |
+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)" |
| 39 |
|
| 40 |
#This is rather special. It's a special target with which one can link |
| 41 |
#applications without bothering with any features that have anything to |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.1 dev-libs/openssl/files/openssl-0.9.8h-pkcs12.patch |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/files/openssl-0.9.8h-pkcs12.patch?rev=1.1&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/files/openssl-0.9.8h-pkcs12.patch?rev=1.1&content-type=text/plain |
| 49 |
|
| 50 |
Index: openssl-0.9.8h-pkcs12.patch |
| 51 |
=================================================================== |
| 52 |
fix from upstream |
| 53 |
|
| 54 |
http://bugs.gentoo.org/224843 |
| 55 |
|
| 56 |
Index: crypto/x509/x509_att.c |
| 57 |
=================================================================== |
| 58 |
RCS file: /usr/local/src/openssl/CVSROOT/openssl/crypto/x509/x509_att.c,v |
| 59 |
retrieving revision 1.8.2.2 |
| 60 |
retrieving revision 1.8.2.3 |
| 61 |
diff -u -p -r1.8.2.2 -r1.8.2.3 |
| 62 |
--- crypto/x509/x509_att.c 2 Apr 2008 11:11:51 -0000 1.8.2.2 |
| 63 |
+++ crypto/x509/x509_att.c 30 May 2008 10:57:13 -0000 1.8.2.3 |
| 64 |
@@ -303,7 +303,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIB |
| 65 |
} |
| 66 |
if(!(attr->value.set = sk_ASN1_TYPE_new_null())) goto err; |
| 67 |
if(!(ttmp = ASN1_TYPE_new())) goto err; |
| 68 |
- if (len == -1) |
| 69 |
+ if ((len == -1) && !(attrtype & MBSTRING_FLAG)) |
| 70 |
{ |
| 71 |
if (!ASN1_TYPE_set1(ttmp, attrtype, data)) |
| 72 |
goto err; |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
-- |
| 77 |
gentoo-commits@l.g.o mailing list |
Archives