Obviously, the solution to this problem is that either readline or openssl has 
to go.  I figured that readline was easier, and libedit support is actually 
already there; it just needs some fixing (which is apparently also being 
worked on upstream).  With the attached patch, I believe the issue should be 
resolved.
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,9 @@
+ntp (1:4.2.4p4+dfsg-6) UNRELEASED; urgency=low
+
+  * Use libedit instead of libreadline, added libedit.patch (closes: #448408)
+
+ -- Peter Eisentraut <[EMAIL PROTECTED]>  Sat, 14 Jun 2008 00:53:11 +0200
+
 ntp (1:4.2.4p4+dfsg-5) unstable; urgency=low
 
   * Removed mentions of -d and -D options from ntpd man page, because the 
diff -u ntp-4.2.4p4+dfsg/debian/control ntp-4.2.4p4+dfsg/debian/control
--- ntp-4.2.4p4+dfsg/debian/control
+++ ntp-4.2.4p4+dfsg/debian/control
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian NTP Team <[EMAIL PROTECTED]>
 Uploaders: Bdale Garbee <[EMAIL PROTECTED]>, Peter Eisentraut <[EMAIL PROTECTED]>, Kurt Roeckx <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 6), libreadline5-dev, libcap-dev | not+linux-gnu, libssl-dev (>= 0.9), quilt (>= 0.40)
-Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev
+Build-Depends: debhelper (>= 6), libedit-dev, libcap-dev | not+linux-gnu, libssl-dev (>= 0.9), quilt (>= 0.40)
+Build-Conflicts: libavahi-compat-libdnssd-dev, libreadline-dev, libwww-dev, libwww-ssl-dev
 Standards-Version: 3.7.3
 Homepage: http://ntp.isc.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ntp/ntp/trunk/
diff -u ntp-4.2.4p4+dfsg/debian/rules ntp-4.2.4p4+dfsg/debian/rules
--- ntp-4.2.4p4+dfsg/debian/rules
+++ ntp-4.2.4p4+dfsg/debian/rules
@@ -30,7 +30,7 @@
 build: config build-stamp
 build-stamp: config.status
 	dh_testdir
-	$(MAKE)
+	$(MAKE) -k
 	touch $@
 
 clean: clean-patched unpatch
diff -u ntp-4.2.4p4+dfsg/debian/patches/series ntp-4.2.4p4+dfsg/debian/patches/series
--- ntp-4.2.4p4+dfsg/debian/patches/series
+++ ntp-4.2.4p4+dfsg/debian/patches/series
@@ -11,2 +11,3 @@
 openssl-disable-check.patch
+libedit.patch
 autotools.patch
diff -u ntp-4.2.4p4+dfsg/debian/patches/autotools.patch ntp-4.2.4p4+dfsg/debian/patches/autotools.patch
only in patch2:
unchanged:
--- ntp-4.2.4p4+dfsg.orig/debian/patches/libedit.patch
+++ ntp-4.2.4p4+dfsg/debian/patches/libedit.patch
@@ -0,0 +1,41 @@
+fixes to be able to use libedit instead of readline; see also bug #448408
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -334,8 +334,8 @@ AC_CHECK_LIB(md5, MD5Init, , 
+   AC_CHECK_LIB(md, MD5Init))
+ AC_CHECK_FUNCS(MD5Init)
+ dnl HMS: What a hack...
+-AC_CHECK_HEADERS(readline/history.h readline/readline.h)
+-case "$ac_cv_header_readline_history_h$ac_cv_header_readline_readline_h" in
++AC_CHECK_HEADERS(editline/history.h editline/readline.h)
++case "$ac_cv_header_editline_history_h$ac_cv_header_editline_readline_h" in
+  *no*) ;;
+  *) save_LIBS=$LIBS
+     LIBS=
+--- a/ntpdc/ntpdc.c
++++ b/ntpdc/ntpdc.c
+@@ -27,8 +27,8 @@
+ #endif /* SYS_WINNT */
+ 
+ #if defined(HAVE_LIBREADLINE) || defined (HAVE_LIBEDIT)
+-# include <readline/readline.h>
+-# include <readline/history.h>
++# include <editline/readline.h>
++# include <editline/history.h>
+ #endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
+ 
+ #ifdef SYS_VXWORKS
+--- a/ntpq/ntpq.c
++++ b/ntpq/ntpq.c
+@@ -31,8 +31,8 @@
+ #endif /* SYS_WINNT */
+ 
+ #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
+-# include <readline/readline.h>
+-# include <readline/history.h>
++# include <editline/readline.h>
++# include <editline/history.h>
+ #endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
+ 
+ #ifdef SYS_VXWORKS

Reply via email to