diff options
author | Colin Watson <cjwatson@debian.org> | 2012-03-19 11:06:07 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-03-19 11:06:07 +0000 |
commit | 27eab7b074d48d902e421067165270c10e64f49c (patch) | |
tree | 4232790013000acf911a05c36bbc843aecdc6298 /debian/patches | |
parent | 18a05171cd83cba446866e0a26e7376aee4e6554 (diff) |
Disable OpenSSL version check again, as its SONAME is sufficient
nowadays (closes: #664383).
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/no-openssl-version-check.patch | 27 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/no-openssl-version-check.patch b/debian/patches/no-openssl-version-check.patch new file mode 100644 index 000000000..d88d0fff0 --- /dev/null +++ b/debian/patches/no-openssl-version-check.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Description: Disable OpenSSL version check | ||
2 | OpenSSL's SONAME is sufficient nowadays. | ||
3 | Author: Philip Hands <phil@hands.com> | ||
4 | Author: Colin Watson <cjwatson@debian.org> | ||
5 | Bug-Debian: http://bugs.debian.org/93581 | ||
6 | Bug-Debian: http://bugs.debian.org/664383 | ||
7 | Forwarded: not-needed | ||
8 | Last-Update: 2012-03-19 | ||
9 | |||
10 | Index: b/entropy.c | ||
11 | =================================================================== | ||
12 | --- a/entropy.c | ||
13 | +++ b/entropy.c | ||
14 | @@ -209,13 +209,6 @@ | ||
15 | #ifndef OPENSSL_PRNG_ONLY | ||
16 | unsigned char buf[RANDOM_SEED_SIZE]; | ||
17 | #endif | ||
18 | - /* | ||
19 | - * OpenSSL version numbers: MNNFFPPS: major minor fix patch status | ||
20 | - * We match major, minor, fix and status (not patch) | ||
21 | - */ | ||
22 | - if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) | ||
23 | - fatal("OpenSSL version mismatch. Built against %lx, you " | ||
24 | - "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay()); | ||
25 | |||
26 | #ifndef OPENSSL_PRNG_ONLY | ||
27 | if (RAND_status() == 1) { | ||
diff --git a/debian/patches/series b/debian/patches/series index 2be7cf10a..11059c095 100644 --- a/debian/patches/series +++ b/debian/patches/series | |||
@@ -39,5 +39,6 @@ doc-hash-tab-completion.patch | |||
39 | auth-log-verbosity.patch | 39 | auth-log-verbosity.patch |
40 | 40 | ||
41 | # Debian-specific configuration | 41 | # Debian-specific configuration |
42 | no-openssl-version-check.patch | ||
42 | gnome-ssh-askpass2-icon.patch | 43 | gnome-ssh-askpass2-icon.patch |
43 | debian-config.patch | 44 | debian-config.patch |