[92363] trunk/dports/devel/openssl

[mww at macports.org]

Revision: 92363
          https://trac.macports.org/changeset/92363
Author:   mww at macports.org
Date:     2012-04-26 08:06:42 -0700 (Thu, 26 Apr 2012)
Log Message:
-----------
version 1.0.1b

Modified Paths:
--------------
    trunk/dports/devel/openssl/Portfile

Removed Paths:
-------------
    trunk/dports/devel/openssl/files/openssl_patchset_22455.diff

Modified: trunk/dports/devel/openssl/Portfile
===================================================================
--- trunk/dports/devel/openssl/Portfile	2012-04-26 10:16:46 UTC (rev 92362)
+++ trunk/dports/devel/openssl/Portfile	2012-04-26 15:06:42 UTC (rev 92363)
@@ -4,7 +4,7 @@
 PortGroup  muniversal 1.0
 
 name                openssl
-version             1.0.1a
+version             1.0.1b
 epoch               1
 revision            0
 platforms           darwin
@@ -22,17 +22,16 @@
     cryptography library.
 
 master_sites        http://www.openssl.org/source/
-checksums           md5     a0104320c0997cd33e18b8ea798609d1 \
-                    sha1    b7c4608c36fa84bfcce39baba5afacd65184be5b \
-                    rmd160  9b55ecfd5c804eda4d0f475263937fb1d5d77195 \
-                    sha256  d3487e09d891c772cf946273a3bb0ca47479e7941be6d822274320e7cfcc361b
+checksums           md5     a1da58ce63baef3812004714fa302c47 \
+                    sha1    b6222cbbf835c27d9ad6db22262da6e4a2aca8b8 \
+                    rmd160  cfdedff06b46866500a2ba72b2dd0d8f3300b4f4 \
+                    sha256  1187bf2d5cdf0b286b951bf5c777aa97855cd7db24fdb9604cb557c8b1d7364b
 
 depends_lib         port:zlib
 
 patchfiles          patch-Makefile.org.diff patch-crypto-Makefile.diff \
-                    patch-bn_internal.pod.diff patch-Configure.diff \
-                    openssl_patchset_22455.diff
-# openssl_patchset_22455.diff is for ticket #34135
+                    patch-bn_internal.pod.diff patch-Configure.diff
+
 post-patch {
     # Ensure that the correct compiler is used
     reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure

Deleted: trunk/dports/devel/openssl/files/openssl_patchset_22455.diff
===================================================================
--- trunk/dports/devel/openssl/files/openssl_patchset_22455.diff	2012-04-26 10:16:46 UTC (rev 92362)
+++ trunk/dports/devel/openssl/files/openssl_patchset_22455.diff	2012-04-26 15:06:42 UTC (rev 92363)
@@ -1,43 +0,0 @@
-Index: openssl/crypto/evp/e_rc4_hmac_md5.c
-RCS File: /v/openssl/cvs/openssl/crypto/evp/e_rc4_hmac_md5.c,v
-rcsdiff -q -kk '-r1.1.2.5' '-r1.1.2.6' -u '/v/openssl/cvs/openssl/crypto/evp/e_rc4_hmac_md5.c,v' 2>/dev/null
---- crypto/evp/e_rc4_hmac_md5.c	2012/04/18 17:51:33	1.1.2.5
-+++ crypto/evp/e_rc4_hmac_md5.c	2012/04/19 20:43:02	1.1.2.6
-@@ -121,6 +121,7 @@
- 		md5_off = MD5_CBLOCK-key->md.num,
- 		blocks;
- 	unsigned int l;
-+	extern unsigned int OPENSSL_ia32cap_P[];
- #endif
- 	size_t	plen = key->payload_length;
- 
-@@ -132,7 +133,8 @@
- 		/* cipher has to "fall behind" */
- 		if (rc4_off>md5_off) md5_off+=MD5_CBLOCK;
- 
--		if (plen>md5_off && (blocks=(plen-md5_off)/MD5_CBLOCK)) {
-+		if (plen>md5_off && (blocks=(plen-md5_off)/MD5_CBLOCK) &&
-+		    (OPENSSL_ia32cap_P[0]&(1<<20))==0) {
- 			MD5_Update(&key->md,in,md5_off);
- 			RC4(&key->ks,rc4_off,in,out);
- 
-@@ -172,7 +174,8 @@
- 		if (md5_off>rc4_off)	rc4_off += 2*MD5_CBLOCK;
- 		else			rc4_off += MD5_CBLOCK;
- 
--		if (len>rc4_off && (blocks=(len-rc4_off)/MD5_CBLOCK)) {
-+		if (len>rc4_off && (blocks=(len-rc4_off)/MD5_CBLOCK) &&
-+		    (OPENSSL_ia32cap_P[0]&(1<<20))==0) {
- 			RC4(&key->ks,rc4_off,in,out);
- 			MD5_Update(&key->md,out,md5_off);
- 
-@@ -289,8 +292,6 @@
- 
- const EVP_CIPHER *EVP_rc4_hmac_md5(void)
- 	{
--	extern unsigned int OPENSSL_ia32cap_P[];
--	/* RC4_CHAR flag ------------vvvvv */
--	return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher);
-+	return(&r4_hmac_md5_cipher);
- 	}
- #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120426/f726205c/attachment.html>