summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-03-31 11:19:33 +0100
committerColin Watson <cjwatson@debian.org>2010-03-31 11:19:33 +0100
commit69456e98a770b7e946b416e5a41ec6288a31e22f (patch)
tree66ae4e885a5e76e8c67552b2f6d1336bcacf96fd /debian/patches
parent131538f5a7aac4befda4191571235f2b444b59e3 (diff)
Drop Debian-specific removal of OpenSSL version check. Upstream ignores
the two patchlevel nybbles now, which is sufficient to address the original reason this change was introduced, and it appears that any change in the major/minor/fix nybbles would involve a new libssl package name. (We'd still lose if the status nybble were ever changed, but that would mean somebody had packaged a development/beta version rather than a proper release, which doesn't appear to be normal practice.)
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/no-openssl-version-check.patch31
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 32 deletions
diff --git a/debian/patches/no-openssl-version-check.patch b/debian/patches/no-openssl-version-check.patch
deleted file mode 100644
index 82f1fa472..000000000
--- a/debian/patches/no-openssl-version-check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Description: Disable OpenSSL version check
2 It may be that this patch should be replaced by more accurate dependencies,
3 and it certainly doesn't seem suitable for upstream. This is a very old
4 change, though, and needs review of current practices in Debian's OpenSSL
5 package.
6Author: Philip Hands <phil@hands.com>
7Bug-Debian: http://bugs.debian.org/93581
8Forwarded: not-needed
9Last-Update: 2010-02-28
10
11Index: b/entropy.c
12===================================================================
13--- a/entropy.c
14+++ b/entropy.c
15@@ -151,6 +151,8 @@
16 void
17 init_rng(void)
18 {
19+#if defined (DISABLED_BY_DEBIAN)
20+ /* drow: Is this check still too strict for Debian? */
21 /*
22 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
23 * We match major, minor, fix and status (not patch)
24@@ -158,6 +160,7 @@
25 if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
26 fatal("OpenSSL version mismatch. Built against %lx, you "
27 "have %lx", OPENSSL_VERSION_NUMBER, SSLeay());
28+#endif
29
30 #ifndef OPENSSL_PRNG_ONLY
31 original_uid = getuid();
diff --git a/debian/patches/series b/debian/patches/series
index aaee184ee..03a17ba91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,6 +44,5 @@ doc-connection-sharing.patch
44doc-hash-tab-completion.patch 44doc-hash-tab-completion.patch
45 45
46# Debian-specific configuration 46# Debian-specific configuration
47no-openssl-version-check.patch
48gnome-ssh-askpass2-icon.patch 47gnome-ssh-askpass2-icon.patch
49debian-config.patch 48debian-config.patch