diff options
| author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
| commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
| tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/sntp/m4/ntp_libntp.m4 | |
| parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
| download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz | |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/sntp/m4/ntp_libntp.m4')
| -rw-r--r-- | contrib/ntp/sntp/m4/ntp_libntp.m4 | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/contrib/ntp/sntp/m4/ntp_libntp.m4 b/contrib/ntp/sntp/m4/ntp_libntp.m4 index 89b94b6..01d82fc 100644 --- a/contrib/ntp/sntp/m4/ntp_libntp.m4 +++ b/contrib/ntp/sntp/m4/ntp_libntp.m4 @@ -328,7 +328,8 @@ AC_ARG_ENABLE( ) have_pthreads=no case "$enable_thread_support" in - yes) + no) ;; + *) ol_found_pthreads=no OL_THREAD_CHECK([ol_found_pthreads=yes]) case "$ol_found_pthreads" in @@ -346,18 +347,6 @@ case "$enable_thread_support" in yes) PTHREAD_LIBS="$LTHREAD_LIBS" have_pthreads=yes - # Bug 2332: With GCC we need to force a reference to libgcc_s - # (if libgcc_s exists) or the combination of - # threads + setuid + mlockall does not work on linux because - # thread cancellation fails to load libgcc_s with dlopen(). - # We have to pass this all as linker options to avoid argument - # reordering by libtool. - case "$GCC$with_gnu_ld" in - yesyes) - AC_CHECK_LIB([gcc_s], [exit], - [PTHREAD_LIBS="$LTHREAD_LIBS -Wl,--no-as-needed,-lgcc_s,--as-needed"]) - ;; - esac esac esac esac |
