[Midnightbsd-cvs] mports [23036] trunk/net/ntp/files: add patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Feb 18 12:35:29 EST 2018
Revision: 23036
http://svnweb.midnightbsd.org/mports/?rev=23036
Author: laffer1
Date: 2018-02-18 12:35:28 -0500 (Sun, 18 Feb 2018)
Log Message:
-----------
add patches
Added Paths:
-----------
trunk/net/ntp/files/patch-include_libssl__compat.h
trunk/net/ntp/files/patch-libntp_libssl__compat.c
trunk/net/ntp/files/patch-ntpd__ntp.conf.5man
trunk/net/ntp/files/patch-ntpd__ntp.conf.html
trunk/net/ntp/files/patch-ntpd__refclock__ripencc.c
trunk/net/ntp/files/patch-sntp_sntp.mdoc.in
trunk/net/ntp/files/patch-sntp_tests_Makefile.in
Added: trunk/net/ntp/files/patch-include_libssl__compat.h
===================================================================
--- trunk/net/ntp/files/patch-include_libssl__compat.h (rev 0)
+++ trunk/net/ntp/files/patch-include_libssl__compat.h 2018-02-18 17:35:28 UTC (rev 23036)
@@ -0,0 +1,11 @@
+--- include/libssl_compat.h.orig 2016-11-21 12:28:40 UTC
++++ include/libssl_compat.h
+@@ -25,7 +25,7 @@
+ #include "openssl/rsa.h"
+
+ /* ----------------------------------------------------------------- */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ /* ----------------------------------------------------------------- */
+
+ # include <openssl/objects.h>
Property changes on: trunk/net/ntp/files/patch-include_libssl__compat.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/ntp/files/patch-libntp_libssl__compat.c
===================================================================
--- trunk/net/ntp/files/patch-libntp_libssl__compat.c (rev 0)
+++ trunk/net/ntp/files/patch-libntp_libssl__compat.c 2018-02-18 17:35:28 UTC (rev 23036)
@@ -0,0 +1,11 @@
+--- libntp/libssl_compat.c.orig 2017-02-01 01:47:13.000000000 -0800
++++ libntp/libssl_compat.c 2017-03-22 22:29:56.409257000 -0700
+@@ -26,7 +26,7 @@
+ /* ----------------------------------------------------------------- */
+
+ /* ----------------------------------------------------------------- */
+-#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+ /* ----------------------------------------------------------------- */
+
+ #include "libssl_compat.h"
Property changes on: trunk/net/ntp/files/patch-libntp_libssl__compat.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/ntp/files/patch-ntpd__ntp.conf.5man
===================================================================
--- trunk/net/ntp/files/patch-ntpd__ntp.conf.5man (rev 0)
+++ trunk/net/ntp/files/patch-ntpd__ntp.conf.5man 2018-02-18 17:35:28 UTC (rev 23036)
@@ -0,0 +1,24 @@
+--- ntpd/ntp.conf.5man.orig 2016-11-21 05:01:41.000000000 -0800
++++ ntpd/ntp.conf.5man 2017-03-07 22:50:54.163145000 -0800
+@@ -22,12 +22,6 @@
+ \- Network Time Protocol (NTP) daemon configuration file format
+ .SH SYNOPSIS
+ \f\*[B-Font]ntp.conf\fP
+-[\f\*[B-Font]\-\-option-name\f[]]
+-[\f\*[B-Font]\-\-option-name\f[] \f\*[I-Font]value\f[]]
+-.sp \n(Ppu
+-.ne 2
+-
+-All arguments must be options.
+ .sp \n(Ppu
+ .ne 2
+
+@@ -190,7 +184,7 @@
+ .NOP \f\*[B-Font]pool\f[]
+ For type s addresses, this command mobilizes a persistent
+ client mode association with a number of remote servers.
+-In this mode the local clock can synchronized to the
++In this mode the local clock can be synchronized to the
+ remote server, but the remote server can never be synchronized to
+ the local clock.
+ .TP 7
Property changes on: trunk/net/ntp/files/patch-ntpd__ntp.conf.5man
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/ntp/files/patch-ntpd__ntp.conf.html
===================================================================
--- trunk/net/ntp/files/patch-ntpd__ntp.conf.html (rev 0)
+++ trunk/net/ntp/files/patch-ntpd__ntp.conf.html 2018-02-18 17:35:28 UTC (rev 23036)
@@ -0,0 +1,11 @@
+--- ntpd/ntp.conf.html.orig 2016-11-21 05:01:54.000000000 -0800
++++ ntpd/ntp.conf.html 2017-01-01 10:47:25.200831000 -0800
+@@ -210,7 +210,7 @@
+ <dl>
+ <dt><code>pool</code><dd>For type s addresses, this command mobilizes a persistent
+ client mode association with a number of remote servers.
+-In this mode the local clock can synchronized to the
++In this mode the local clock can be synchronized to the
+ remote server, but the remote server can never be synchronized to
+ the local clock.
+ <br><dt><code>server</code><dd>For type s and r addresses, this command mobilizes a persistent
Property changes on: trunk/net/ntp/files/patch-ntpd__ntp.conf.html
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/ntp/files/patch-ntpd__refclock__ripencc.c
===================================================================
--- trunk/net/ntp/files/patch-ntpd__refclock__ripencc.c (rev 0)
+++ trunk/net/ntp/files/patch-ntpd__refclock__ripencc.c 2018-02-18 17:35:28 UTC (rev 23036)
@@ -0,0 +1,38 @@
+--- ntpd/refclock_ripencc.c.orig 2014-12-18 18:42:01.000000000 -0800
++++ ntpd/refclock_ripencc.c 2017-11-23 19:41:57.473988000 -0800
+@@ -1517,7 +1517,7 @@
+
+ record_clock_stats(&peer->srcadr, logbuf);
+
+- if (!utcflags & UTCF_UTC_AVAIL)
++ if (!(utcflags & UTCF_UTC_AVAIL))
+ return(-1);
+
+ /* poll for UTC parameters once and then if UTC flag changed */
+@@ -3442,7 +3442,7 @@
+ status1, status2;
+ const char
+ *text;
+- static const char const
++ static const char
+ *sc_text[] = {
+ "Doing position fixes",
+ "Don't have GPS time yet",
+@@ -4442,8 +4442,6 @@
+ known = TRUE;
+ }
+ if (known == FALSE) pbuf += sprintf(pbuf, "No known");
+- reserved = reserved;
+-
+ }
+
+ /* 0x8F */
+@@ -5059,7 +5057,7 @@
+ {
+ for (i=0; i<8; i++)
+ {
+- if (Flags&(1<<i)) pbuf += sprintf(pbuf, LeapStatusText[i]);
++ if (Flags&(1<<i)) pbuf += sprintf(pbuf, " %s", LeapStatusText[i]);
+ }
+ }
+ else
Property changes on: trunk/net/ntp/files/patch-ntpd__refclock__ripencc.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/ntp/files/patch-sntp_sntp.mdoc.in
===================================================================
--- trunk/net/ntp/files/patch-sntp_sntp.mdoc.in (rev 0)
+++ trunk/net/ntp/files/patch-sntp_sntp.mdoc.in 2018-02-18 17:35:28 UTC (rev 23036)
@@ -0,0 +1,11 @@
+--- sntp/sntp.mdoc.in.orig 2016-06-02 11:20:05 UTC
++++ sntp/sntp.mdoc.in
+@@ -211,7 +211,7 @@ of seconds specified before giving up.
+ more than enough for a unicast response. If \fBsntp\fP is
+ only waiting for a broadcast response a longer timeout is
+ likely needed.
+-.It Fl \-wait , " Fl \-no\-wait"
++.It Fl \-wait , Fl \-no\-wait
+ Wait for pending replies (if not setting the time).
+ The \fIno\-wait\fP form will disable the option.
+ This option is enabled by default.
Property changes on: trunk/net/ntp/files/patch-sntp_sntp.mdoc.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/ntp/files/patch-sntp_tests_Makefile.in
===================================================================
--- trunk/net/ntp/files/patch-sntp_tests_Makefile.in (rev 0)
+++ trunk/net/ntp/files/patch-sntp_tests_Makefile.in 2018-02-18 17:35:28 UTC (rev 23036)
@@ -0,0 +1,10 @@
+--- sntp/tests/Makefile.in.orig 2015-10-27 12:47:07 UTC
++++ sntp/tests/Makefile.in
+@@ -791,6 +791,7 @@ LDADD = \
+ $(base_LDADD) \
+ $(top_builddir)/unity/libunity.a \
+ $(LIBM) \
++ $(PTHREAD_LIBS) \
+ $(NULL)
+
+ AM_CFLAGS = $(CFLAGS_NTP)
Property changes on: trunk/net/ntp/files/patch-sntp_tests_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list