diff options
author | Cy Schubert <cy@FreeBSD.org> | 2012-08-15 17:33:00 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2012-08-15 17:33:00 +0000 |
commit | b808bf84898b72dd0f1e336eb1dd7c03d64358ec (patch) | |
tree | c9dbac3c31108c9fb7f1e42bb734f97673063583 /net/ntp-devel/files | |
parent | dd new cfengine-devel port. (diff) |
Update 4.2.7p289 --> 4.2.7p295
Remove patches (suggested by Harlan Stenn <stenn@ntp.org>).
Notes
Notes:
svn path=/head/; revision=302589
Diffstat (limited to 'net/ntp-devel/files')
-rw-r--r-- | net/ntp-devel/files/patch-libntp-refnumtoa.c | 12 | ||||
-rw-r--r-- | net/ntp-devel/files/patch-ntpd-ntp_io.c | 21 | ||||
-rw-r--r-- | net/ntp-devel/files/patch-sntp-configure | 11 |
3 files changed, 0 insertions, 44 deletions
diff --git a/net/ntp-devel/files/patch-libntp-refnumtoa.c b/net/ntp-devel/files/patch-libntp-refnumtoa.c deleted file mode 100644 index 6b68cea5451c..000000000000 --- a/net/ntp-devel/files/patch-libntp-refnumtoa.c +++ /dev/null @@ -1,12 +0,0 @@ ---- libntp/refnumtoa.c.orig 2001-10-09 00:05:38.000000000 -0700 -+++ libntp/refnumtoa.c 2008-07-24 22:45:30.917697416 -0700 -@@ -2,6 +2,9 @@ - * refnumtoa - return asciized refclock addresses stored in local array space - */ - #include <stdio.h> -+#ifdef __FreeBSD_cc_version -+#include <netinet/in.h> -+#endif - - #include "ntp_fp.h" - #include "lib_strbuf.h" diff --git a/net/ntp-devel/files/patch-ntpd-ntp_io.c b/net/ntp-devel/files/patch-ntpd-ntp_io.c deleted file mode 100644 index cdf1eada580f..000000000000 --- a/net/ntp-devel/files/patch-ntpd-ntp_io.c +++ /dev/null @@ -1,21 +0,0 @@ ---- ntpd/ntp_io.c.orig 2010-06-03 20:24:51.000000000 -0700 -+++ ntpd/ntp_io.c 2010-06-03 20:27:36.000000000 -0700 -@@ -1414,12 +1414,18 @@ - sockaddr_u *psau - ) - { -+ unsigned char zerobuf[8]; -+ - if (IS_IPV4(psau) && !NSRCADR(psau)) - return 1; - - #ifdef INCLUDE_IPV6_SUPPORT - if (IS_IPV6(psau) && S_ADDR6_EQ(psau, &in6addr_any)) - return 1; -+ bzero(zerobuf, sizeof(zerobuf)); -+ // If the host portion is all 0, then assume it's a router's anycast address. -+ if (IS_IPV6(psau) && memcmp((char*)(&((struct sockaddr_in6*)psau)->sin6_addr) + 8, zerobuf, 8) == 0) -+ return 1; - #endif - - return 0; diff --git a/net/ntp-devel/files/patch-sntp-configure b/net/ntp-devel/files/patch-sntp-configure deleted file mode 100644 index 88079c0ee752..000000000000 --- a/net/ntp-devel/files/patch-sntp-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- sntp/configure.orig 2011-10-20 13:52:03.855932784 -0700 -+++ sntp/configure 2011-10-20 16:09:10.154292211 -0700 -@@ -24094,7 +24094,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: Using the installed libevent" >&5 - $as_echo "$as_me: Using the installed libevent" >&6;} - CPPFLAGS_LIBEVENT=`$PKG_CONFIG --cflags-only-I libevent` -- LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent | sed 's:-levent::'` -+ LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent` - case "$LIBISC_PTHREADS_NOTHREADS" in - pthreads) - LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_pthreads" |