Bug#732940: 6.4p1-1.1 NMU diff
Hi,
Here is the diff of the NMU that I uploaded.
Kurt
diff -Nru openssh-6.4p1/debian/changelog openssh-6.4p1/debian/changelog
--- openssh-6.4p1/debian/changelog 2013-11-09 19:24:22.000000000 +0100
+++ openssh-6.4p1/debian/changelog 2013-12-23 11:15:26.000000000 +0100
@@ -1,3 +1,10 @@
+openssh (1:6.4p1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Adjust check for openssl version (Closes: #732940)
+
+ -- Kurt Roeckx <kurt@roeckx.be> Mon, 23 Dec 2013 10:33:59 +0100
+
openssh (1:6.4p1-1) unstable; urgency=high
* New upstream release. Important changes:
diff -Nru openssh-6.4p1/debian/patches/openssl_version.patch openssh-6.4p1/debian/patches/openssl_version.patch
--- openssh-6.4p1/debian/patches/openssl_version.patch 1970-01-01 01:00:00.000000000 +0100
+++ openssh-6.4p1/debian/patches/openssl_version.patch 2013-12-23 11:08:55.000000000 +0100
@@ -0,0 +1,23 @@
+From: Kurt Roeckx <kurt@roeckx.be>
+Date: Mon, 23 Dec 2013 10:44:43 +0100
+Subject: Don't check the status field of the openssl version
+
+There is no reason to check the version of openssl (in Debian). If it's not
+compatible the soname will change. Openssh seems to want to do a check for the
+soname based on the version number, but wants to keep the status of the release
+the same. Remove that check on the status since it doesn't tell you anything
+about how compatible that version is.
+
+Index: openssh-6.4p1/entropy.c
+===================================================================
+--- openssh-6.4p1.orig/entropy.c 2013-12-23 11:08:36.035642096 +0100
++++ openssh-6.4p1/entropy.c 2013-12-23 11:08:52.723282762 +0100
+@@ -216,7 +216,7 @@
+ * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
+ * within a patch series.
+ */
+- u_long version_mask = SSLeay() >= 0x1000000f ? ~0xffff0L : ~0xff0L;
++ u_long version_mask = SSLeay() >= 0x1000000f ? ~0xfffffL : ~0xff0L;
+ if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) ||
+ (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12))
+ fatal("OpenSSL version mismatch. Built against %lx, you "
diff -Nru openssh-6.4p1/debian/patches/series openssh-6.4p1/debian/patches/series
--- openssh-6.4p1/debian/patches/series 2013-09-15 00:07:14.000000000 +0200
+++ openssh-6.4p1/debian/patches/series 2013-12-23 10:44:07.000000000 +0100
@@ -26,6 +26,7 @@
dnssec-sshfp.patch
auth-log-verbosity.patch
mention-ssh-keygen-on-keychange.patch
+openssl_version.patch
# Versioning
package-versioning.patch
Reply to: