diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/autotools.patch | 26 | ||||
| -rw-r--r-- | debian/patches/openssl-headers.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 51 insertions, 1 deletions
diff --git a/debian/patches/autotools.patch b/debian/patches/autotools.patch index 100fc2c..373f071 100644 --- a/debian/patches/autotools.patch +++ b/debian/patches/autotools.patch @@ -1068,6 +1068,19 @@ until it works. { $as_echo "$as_me:${as_lineno-$LINENO}: checking VARITEXT clock" >&5 $as_echo_n "checking VARITEXT clock... " >&6; } +@@ -22915,10 +22964,10 @@ + case "$ans" in + no) + ;; +- *) # look for openssl/opensslconf.h: ++ *) # look for openssl/opensslv.h: + for i in $ans no + do +- test -f $i/openssl/opensslconf.h && break ++ test -f $i/openssl/opensslv.h && break + done + case "$i" in + no) @@ -25112,8 +25161,6 @@ ac_config_files="$ac_config_files Makefile" @@ -4432,6 +4445,19 @@ until it works. ac_config_commands="$ac_config_commands libtool" +@@ -14857,10 +14930,10 @@ + case "$ans" in + no) + ;; +- *) # look for openssl/opensslconf.h: ++ *) # look for openssl/opensslv.h: + for i in $ans no + do +- test -f $i/openssl/opensslconf.h && break ++ test -f $i/openssl/opensslv.h && break + done + case "$i" in + no) @@ -16881,6 +16954,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' diff --git a/debian/patches/openssl-headers.patch b/debian/patches/openssl-headers.patch new file mode 100644 index 0000000..f26d21f --- /dev/null +++ b/debian/patches/openssl-headers.patch @@ -0,0 +1,23 @@ +Description: Make OpenSSL header detection more reliable + <openssl/opensslconf.h> is architecture-dependent and so may reside in a + different location on multiarch-capable systems. Check for + <openssl/opensslv.h> instead. +Author: Colin Watson <cjwatson@ubuntu.com> +Forwarded: no +Last-Update: 2012-12-20 + +--- a/m4/ntp_openssl.m4 ++++ b/m4/ntp_openssl.m4 +@@ -86,10 +86,10 @@ + case "$ans" in + no) + ;; +- *) # look for openssl/opensslconf.h: ++ *) # look for openssl/opensslv.h: + for i in $ans no + do +- test -f $i/openssl/opensslconf.h && break ++ test -f $i/openssl/opensslv.h && break + done + case "$i" in + no) diff --git a/debian/patches/series b/debian/patches/series index 8fe5cf8..c2ec25e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,6 +6,7 @@ ntpd-linux-caps-inheritable.patch ntpd-ni-maxhost.patch openssl-disable-check.patch libedit.patch -autotools.patch format-security.patch sntp-manpage.patch +openssl-headers.patch +autotools.patch |