Package: ntp
Version: 1:4.2.4p4+dfsg-1
Severity: serious
Tags: patch

The ntp package isn't usable in (at least) unstable, because it incorrectly
presumes to second-guess the correct OpenSSL version to link against:

Oct 21 00:19:55 borges ntpd[32073]: ntpd: OpenSSL version mismatch. Built 
against 908070, you have 90807f 

and exits immediately afterwards.

ntp should not be second-guessing the Debian library dependency handling. 
FWIW, this seems to be a recurrence of bug #286913, which was fixed in 2004;
where did that patch disappear to?

The attached patch should correct this bug again.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -u ntp-4.2.4p4+dfsg/debian/changelog ntp-4.2.4p4+dfsg/debian/changelog
--- ntp-4.2.4p4+dfsg/debian/changelog
+++ ntp-4.2.4p4+dfsg/debian/changelog
@@ -1,3 +1,12 @@
+ntp (1:4.2.4p4+dfsg-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Don't second-guess the Debian dependencies by erroring out when a
+    different version of OpenSSL is found.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Sun, 21 Oct 2007 00:58:07 -0700
+
 ntp (1:4.2.4p4+dfsg-1) unstable; urgency=medium
 
   * New upstream release
only in patch2:
unchanged:
--- ntp-4.2.4p4+dfsg.orig/ntpd/ntpd.c
+++ ntp-4.2.4p4+dfsg/ntpd/ntpd.c
@@ -506,15 +506,6 @@
 	}
 #endif
 
-#ifdef OPENSSL
-	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) {
-		msyslog(LOG_ERR,
-		    "ntpd: OpenSSL version mismatch. Built against %lx, you have %lx\n",
-		    OPENSSL_VERSION_NUMBER, SSLeay());
-		exit(1);
-	}
-#endif
-
 	/* getstartup(argc, argv); / * startup configuration, may set debug */
 
 #ifdef DEBUG
only in patch2:
unchanged:
--- ntp-4.2.4p4+dfsg.orig/util/ntp-keygen.c
+++ ntp-4.2.4p4+dfsg/util/ntp-keygen.c
@@ -255,20 +255,8 @@
 #endif
 
 #ifdef OPENSSL
-	/*
-	 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
-	 * We match major, minor, fix and status (not patch)
-	 */
-	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) {
-		fprintf(stderr,
-		    "OpenSSL version mismatch. Built against %lx, you have %lx\n",
-		    OPENSSL_VERSION_NUMBER, SSLeay());
-		return (-1);
-
-	} else {
-		fprintf(stderr,
-		    "Using OpenSSL version %lx\n", SSLeay());
-	}
+	fprintf(stderr,
+	    "Using OpenSSL version %lx\n", SSLeay());
 #endif /* OPENSSL */
 
 	/*

Reply via email to