summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-03-19 11:06:07 +0000
committerColin Watson <cjwatson@debian.org>2012-03-19 11:06:07 +0000
commit27eab7b074d48d902e421067165270c10e64f49c (patch)
tree4232790013000acf911a05c36bbc843aecdc6298 /debian/patches
parent18a05171cd83cba446866e0a26e7376aee4e6554 (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.patch27
-rw-r--r--debian/patches/series1
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 @@
1Description: Disable OpenSSL version check
2 OpenSSL's SONAME is sufficient nowadays.
3Author: Philip Hands <phil@hands.com>
4Author: Colin Watson <cjwatson@debian.org>
5Bug-Debian: http://bugs.debian.org/93581
6Bug-Debian: http://bugs.debian.org/664383
7Forwarded: not-needed
8Last-Update: 2012-03-19
9
10Index: 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
39auth-log-verbosity.patch 39auth-log-verbosity.patch
40 40
41# Debian-specific configuration 41# Debian-specific configuration
42no-openssl-version-check.patch
42gnome-ssh-askpass2-icon.patch 43gnome-ssh-askpass2-icon.patch
43debian-config.patch 44debian-config.patch