diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-03-28 10:07:03 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-03-28 10:07:03 +0300 |
| commit | f44ae22eacbc30a3ac4b6ac847b49e5167c486d8 (patch) | |
| tree | 55f9e45ccd8bfdc22eb4a17841dd5e17cf2132ae /main/openssh | |
| parent | cb7f8c95ca72afab2e58fecb285994203e4e696c (diff) | |
| download | aports-f44ae22eacbc30a3ac4b6ac847b49e5167c486d8.tar.bz2 aports-f44ae22eacbc30a3ac4b6ac847b49e5167c486d8.tar.xz | |
main/openssh: fix openssl abi compatibility detection (for openssl-1.0+)
Diffstat (limited to 'main/openssh')
| -rw-r--r-- | main/openssh/APKBUILD | 4 | ||||
| -rw-r--r-- | main/openssh/openssh-fix-openssl-abi.diff | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index 17d846c2db..4f5d86005d 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -2,7 +2,7 @@ pkgname=openssh pkgver=5.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=1 +pkgrel=2 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -13,6 +13,7 @@ subpackages="$pkgname-doc $pkgname-client" source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz openssh${pkgver%_*}-dynwindow_noneswitch.diff openssh${pkgver%_*}-peaktput.diff + openssh-fix-openssl-abi.diff sshd.initd sshd.confd " @@ -89,5 +90,6 @@ client() { md5sums="afe17eee7e98d3b8550cc349834a85d0 openssh-5.9p1.tar.gz f3db05e57e7af4cb2b55b85117652ed3 openssh5.9-dynwindow_noneswitch.diff 949ff348573438163240c60d6c3618eb openssh5.9-peaktput.diff +c6f0728f19a80f680b0ee3922f3084cf openssh-fix-openssl-abi.diff cb0dd08c413fad346f0c594107b4a2e0 sshd.initd b35e9f3829f4cfca07168fcba98749c7 sshd.confd" diff --git a/main/openssh/openssh-fix-openssl-abi.diff b/main/openssh/openssh-fix-openssl-abi.diff new file mode 100644 index 0000000000..2b4a4cc931 --- /dev/null +++ b/main/openssh/openssh-fix-openssl-abi.diff @@ -0,0 +1,20 @@ +--- openssh-5.9p1/entropy.c.orig ++++ openssh-5.9p1/entropy.c +@@ -206,6 +206,7 @@ + void + seed_rng(void) + { ++ u_long mask; + #ifndef OPENSSL_PRNG_ONLY + unsigned char buf[RANDOM_SEED_SIZE]; + #endif +@@ -213,7 +214,8 @@ + * OpenSSL version numbers: MNNFFPPS: major minor fix patch status + * We match major, minor, fix and status (not patch) + */ +- if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) ++ mask = (OPENSSL_VERSION_NUMBER >= 0x10000000) ? 0xffff0L : 0xff0L; ++ if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~mask) + fatal("OpenSSL version mismatch. Built against %lx, you " + "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay()); + |