diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 18:58:24 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 18:58:24 +0200 |
| commit | e2c6c9de15db4ea553e6fcf3678750ac1541c52b (patch) | |
| tree | c5affbe6f4da0e5425e27890f12738e56d154b4d /core | |
| parent | c8bd9200906149d53827aaa64e85a7008d51339f (diff) | |
openssl-1.0.1.b fixed the non-x86 build bug.
Diffstat (limited to 'core')
| -rw-r--r-- | core/openssl/PKGBUILD | 11 | ||||
| -rw-r--r-- | core/openssl/openssl-1.0.1a_cpu.patch | 15 |
2 files changed, 3 insertions, 23 deletions
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index d34178ed1..5b616b90b 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -18,13 +18,11 @@ backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' - 'ca-dir.patch' - 'openssl-1.0.1a_cpu.patch') -md5sums=('a0104320c0997cd33e18b8ea798609d1' + 'ca-dir.patch') +md5sums=('a1da58ce63baef3812004714fa302c47' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90' - '8edaef3ee595707c18fcbd7dafae940f') + '3bf51be3a1bbd262be46dc619f92aa90') build() { cd $srcdir/$pkgname-$_ver @@ -36,9 +34,6 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch - # fix building on non-x86 - # see http://rt.openssl.org/Ticket/Display.html?id=2795&user=guest&pass=guest - patch -p1 -i $srcdir/openssl-1.0.1a_cpu.patch case "${CARCH}" in 'x86_64') diff --git a/core/openssl/openssl-1.0.1a_cpu.patch b/core/openssl/openssl-1.0.1a_cpu.patch deleted file mode 100644 index a6b85988a..000000000 --- a/core/openssl/openssl-1.0.1a_cpu.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- openssl-1.0.1a/crypto/evp/e_rc4_hmac_md5.c Wed Apr 18 17:51:33 2012 -+++ /tmp/e_rc4_hmac_md5.c Thu Apr 19 14:28:41 2012 -@@ -289,8 +289,12 @@ - - const EVP_CIPHER *EVP_rc4_hmac_md5(void) - { -+#if defined(STITCHED_CALL) - extern unsigned int OPENSSL_ia32cap_P[]; - /* RC4_CHAR flag ------------vvvvv */ - return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher); -+#else -+ return(&r4_hmac_md5_cipher); -+#endif - } - #endif |