diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/patches/no-openssl-version-check.patch | 27 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b0e975ecb..9ef1bc0d5 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,10 @@ | |||
1 | openssh (1:5.9p1-4) UNRELEASED; urgency=low | ||
2 | |||
3 | * Disable OpenSSL version check again, as its SONAME is sufficient | ||
4 | nowadays (closes: #664383). | ||
5 | |||
6 | -- Colin Watson <cjwatson@debian.org> Mon, 19 Mar 2012 11:04:52 +0000 | ||
7 | |||
1 | openssh (1:5.9p1-3) unstable; urgency=low | 8 | openssh (1:5.9p1-3) unstable; urgency=low |
2 | 9 | ||
3 | * debconf template translations: | 10 | * debconf template translations: |
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 |