doc/share/security/patches/SA-15:25/ntp-93-inc.patch
Gleb Smirnoff 3bdc44ff8a o Fix regressions related to SA-15:25 upgrade of NTP. [1]
o Fix kqueue write events never fired for files greater 2GB. [2]
o Fix kpplications exiting due to segmentation violation on a correct
  memory address. [3]

PR:		204046 [1]
PR:		204203 [1]
Errata Notice:	FreeBSD-EN-15:19.kqueue [2]
Errata Notice:	FreeBSD-EN-15:20.vm [3]
Approved by:	so
2015-11-04 11:52:12 +00:00

37 lines
1.1 KiB
Diff

--- usr.sbin/ntp/config.h.orig
+++ usr.sbin/ntp/config.h
@@ -120,7 +120,7 @@
#define CLOCK_PST 1
/* DCF77 raw time code */
-/* #undef CLOCK_RAWDCF */
+#define CLOCK_RAWDCF 1
/* RCC 8000 clock */
/* #undef CLOCK_RCC8000 */
--- usr.sbin/ntp/ntpdc/Makefile.orig
+++ usr.sbin/ntp/ntpdc/Makefile
@@ -17,8 +17,8 @@
-I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
-I${.CURDIR}/../ -I${.CURDIR}
-DPADD= ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBEDIT} ${LIBTERMCAP}
-LDADD= ${LIBNTP} -lm ${LIBOPTS} -ledit -ltermcap
+DPADD= ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBEDIT} ${LIBTERMCAP} ${LIBPTHREAD}
+LDADD= ${LIBNTP} -lm ${LIBOPTS} -ledit -ltermcap -lpthread
CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
-I${DESTDIR}/${INCLUDEDIR}/edit
--- usr.sbin/ntp/ntpq/Makefile.orig
+++ usr.sbin/ntp/ntpq/Makefile
@@ -20,8 +20,8 @@
-I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-I${.CURDIR}/../
-DPADD= ${LIBEDIT} ${LIBNTP} ${LIBM} ${LIBOPTS}
-LDADD= -ledit ${LIBNTP} -lm ${LIBOPTS}
+DPADD= ${LIBEDIT} ${LIBNTP} ${LIBM} ${LIBOPTS} ${LIBPTHREAD}
+LDADD= -ledit ${LIBNTP} -lm ${LIBOPTS} -lpthread
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}