Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by prlw1 in tick...
details: https://anonhg.NetBSD.org/src/rev/98d3d7fc3d1a
branches: netbsd-7
changeset: 798753:98d3d7fc3d1a
user: martin <martin%NetBSD.org@localhost>
date: Mon Dec 29 17:27:28 2014 +0000
description:
Pull up following revision(s) (requested by prlw1 in ticket #358):
sbin/route/route.c: revision 1.149
external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c: revision 1.7
external/bsd/ipf/dist/lib/printhost.c: revision 1.3
usr.sbin/lpr/common_source/common.c: revision 1.43
usr.sbin/lpr/common_source/Makefile: revision 1.12
external/bsd/ipf/dist/lib/printhostmask.c: revision 1.3
external/bsd/ipf/dist/lib/save_v1trap.c: revision 1.2
external/bsd/dhcpcd/dist/dhcpcd.c: revision 1.21
external/bsd/tcpdump/bin/Makefile: revision 1.12
external/bsd/ipf/dist/lib/save_v2trap.c: revision 1.2
external/bsd/ipf/dist/tools/lexer.c: revision 1.2
external/bsd/ppp/usr.sbin/pppd/sys-bsd.c: revision 1.3
external/bsd/ipf/dist/lib/printipfexpr.c: revision 1.2
MKINET6=no build fixes
http://mail-index.netbsd.org/tech-net/2014/12/13/msg004898.html
diffstat:
external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c | 2 +-
external/bsd/dhcpcd/dist/dhcpcd.c | 5 ++-
external/bsd/ipf/dist/lib/printhost.c | 4 +-
external/bsd/ipf/dist/lib/printhostmask.c | 4 +-
external/bsd/ipf/dist/lib/printipfexpr.c | 4 ++-
external/bsd/ipf/dist/lib/save_v1trap.c | 4 +-
external/bsd/ipf/dist/lib/save_v2trap.c | 4 +-
external/bsd/ipf/dist/tools/lexer.c | 10 +++++++-
external/bsd/ppp/usr.sbin/pppd/sys-bsd.c | 2 +
external/bsd/tcpdump/bin/Makefile | 5 +--
sbin/route/route.c | 12 +++++++---
usr.sbin/lpr/common_source/Makefile | 8 ++++++-
usr.sbin/lpr/common_source/common.c | 17 ++++++++------
13 files changed, 53 insertions(+), 28 deletions(-)
diffs (truncated from 341 to 300 lines):
diff -r c8beef60e58b -r 98d3d7fc3d1a external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
--- a/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Mon Dec 29 17:27:28 2014 +0000
@@ -718,7 +718,7 @@
err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn));
if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); }
}
-#elif defined(IPV6_PKTINFO)
+ #elif defined(IPV6_PKTINFO)
if (err == 0)
{
err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn));
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/dhcpcd/dist/dhcpcd.c
--- a/external/bsd/dhcpcd/dist/dhcpcd.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/dhcpcd/dist/dhcpcd.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcpcd.c,v 1.7.2.1 2014/12/29 16:18:05 martin Exp $");
+ __RCSID("$NetBSD: dhcpcd.c,v 1.7.2.2 2014/12/29 17:27:28 martin Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -745,8 +745,9 @@
!(ifo->options & (DHCPCD_INFORM | DHCPCD_PFXDLGONLY)))
ipv6nd_startrs(ifp);
- if (ifo->options & DHCPCD_DHCP6)
+ if (ifo->options & DHCPCD_DHCP6) {
dhcp6_find_delegates(ifp);
+ }
if (!(ifo->options & DHCPCD_IPV6RS) ||
ifo->options & DHCPCD_IA_FORCED)
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/ipf/dist/lib/printhost.c
--- a/external/bsd/ipf/dist/lib/printhost.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/ipf/dist/lib/printhost.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: printhost.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: printhost.c,v 1.2.12.1 2014/12/29 17:27:28 martin Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -25,9 +25,9 @@
if ((family == -1) || !*addr)
PRINTF("any");
else {
+#ifdef USE_INET6
void *ptr = addr;
-#ifdef USE_INET6
PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf)));
#else
ipa.s_addr = *addr;
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/ipf/dist/lib/printhostmask.c
--- a/external/bsd/ipf/dist/lib/printhostmask.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/ipf/dist/lib/printhostmask.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: printhostmask.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: printhostmask.c,v 1.2.12.1 2014/12/29 17:27:28 martin Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -25,9 +25,9 @@
if ((family == -1) || ((!addr || !*addr) && (!mask || !*mask)))
PRINTF("any");
else {
+#ifdef USE_INET6
void *ptr = addr;
-#ifdef USE_INET6
PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf)));
#else
ipa.s_addr = *addr;
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/ipf/dist/lib/printipfexpr.c
--- a/external/bsd/ipf/dist/lib/printipfexpr.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/ipf/dist/lib/printipfexpr.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,11 +1,13 @@
-/* $NetBSD: printipfexpr.c,v 1.1.1.2 2012/07/22 13:44:41 darrenr Exp $ */
+/* $NetBSD: printipfexpr.c,v 1.1.1.2.12.1 2014/12/29 17:27:28 martin Exp $ */
#include "ipf.h"
static void printport __P((int *));
static void printhosts __P((int *));
static void printsingle __P((int *));
+#ifdef USE_INET6
static void printhostsv6 __P((int *));
+#endif
void
printipfexpr(array)
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/ipf/dist/lib/save_v1trap.c
--- a/external/bsd/ipf/dist/lib/save_v1trap.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/ipf/dist/lib/save_v1trap.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: save_v1trap.c,v 1.1.1.2 2012/07/22 13:44:42 darrenr Exp $ */
+/* $NetBSD: save_v1trap.c,v 1.1.1.2.12.1 2014/12/29 17:27:28 martin Exp $ */
#include "ipf.h"
#include "netinet/ipl.h"
@@ -180,7 +180,7 @@
if (ctx->fd >= 0) {
ctx->sin.sin_family = AF_INET;
ctx->sin.sin_port = htons(162);
- if (connect(ctx->fd, &ctx->sin,
+ if (connect(ctx->fd, (struct sockaddr *)&ctx->sin,
sizeof(ctx->sin)) != 0) {
snmpv1_destroy(ctx);
return NULL;
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/ipf/dist/lib/save_v2trap.c
--- a/external/bsd/ipf/dist/lib/save_v2trap.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/ipf/dist/lib/save_v2trap.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: save_v2trap.c,v 1.1.1.2 2012/07/22 13:44:43 darrenr Exp $ */
+/* $NetBSD: save_v2trap.c,v 1.1.1.2.12.1 2014/12/29 17:27:28 martin Exp $ */
#include "ipf.h"
#include "netinet/ipl.h"
@@ -183,7 +183,7 @@
if (ctx->fd >= 0) {
ctx->sin.sin_family = AF_INET;
ctx->sin.sin_port = htons(162);
- if (connect(ctx->fd, &ctx->sin,
+ if (connect(ctx->fd, (struct sockaddr *)&ctx->sin,
sizeof(ctx->sin)) != 0) {
snmpv2_destroy(ctx);
return NULL;
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/ipf/dist/tools/lexer.c
--- a/external/bsd/ipf/dist/tools/lexer.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/ipf/dist/tools/lexer.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lexer.c,v 1.1.1.2 2012/07/22 13:44:59 darrenr Exp $ */
+/* $NetBSD: lexer.c,v 1.1.1.2.12.1 2014/12/29 17:27:29 martin Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -176,8 +176,10 @@
int yylex()
{
+#ifdef USE_INET6
static int prior = 0;
static int priornum = 0;
+#endif
int c, n, isbuilding, rval, lnext, nokey = 0;
char *name;
int triedv6 = 0;
@@ -239,7 +241,9 @@
if (lnext == 1) {
lnext = 0;
if ((isbuilding == 0) && !ISALNUM(c)) {
+#ifdef USE_INET6
prior = c;
+#endif
return c;
}
goto nextchar;
@@ -330,7 +334,9 @@
yytokentype = 0;
if (yydebug)
fprintf(stderr, "reset at EOF\n");
+#ifdef USE_INET6
prior = 0;
+#endif
return 0;
}
@@ -594,9 +600,11 @@
yypos = 0;
}
+#ifdef USE_INET6
if (rval == YY_NUMBER)
priornum = yylval.num;
prior = rval;
+#endif
return rval;
}
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
--- a/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c Mon Dec 29 17:27:28 2014 +0000
@@ -189,7 +189,9 @@
static int max_in_fd; /* highest fd set in in_fds */
static int if_is_up; /* the interface is currently up */
+#ifdef INET6
static int if6_is_up; /* the interface is currently up */
+#endif /* INET6 */
static u_int32_t ifaddrs[2]; /* local and remote addresses we set */
static u_int32_t default_route_gateway; /* gateway addr for default route */
static u_int32_t proxy_arp_addr; /* remote addr for proxy arp */
diff -r c8beef60e58b -r 98d3d7fc3d1a external/bsd/tcpdump/bin/Makefile
--- a/external/bsd/tcpdump/bin/Makefile Mon Dec 29 17:19:18 2014 +0000
+++ b/external/bsd/tcpdump/bin/Makefile Mon Dec 29 17:27:28 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/12/31 17:33:11 christos Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2014/12/29 17:27:29 martin Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -33,7 +33,6 @@
print-ascii.c \
print-atalk.c \
print-atm.c \
-print-babel.c \
print-beep.c \
print-bfd.c \
print-bgp.c \
@@ -167,7 +166,7 @@
CPPFLAGS+=-DWITH_CHROOT=\"/var/chroot/tcpdump\"
.if (${USE_INET6} != "no")
-SRCS+= print-ip6.c print-ip6opts.c print-icmp6.c \
+SRCS+= print-babel.c print-ip6.c print-ip6opts.c print-icmp6.c \
print-rt6.c print-dhcp6.c print-ospf6.c
CPPFLAGS+=-DINET6=1 -DHAVE_RES_USE_INET6=1
diff -r c8beef60e58b -r 98d3d7fc3d1a sbin/route/route.c
--- a/sbin/route/route.c Mon Dec 29 17:19:18 2014 +0000
+++ b/sbin/route/route.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.144 2013/10/19 15:59:15 christos Exp $ */
+/* $NetBSD: route.c,v 1.144.4.1 2014/12/29 17:27:28 martin Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: route.c,v 1.144 2013/10/19 15:59:15 christos Exp $");
+__RCSID("$NetBSD: route.c,v 1.144.4.1 2014/12/29 17:27:28 martin Exp $");
#endif
#endif /* not lint */
@@ -1393,8 +1393,10 @@
int
prefixlen(const char *s, struct sou *soup)
{
- int len = atoi(s), q, r;
- int max;
+ int max, len = atoi(s);
+#ifdef INET6
+ int q, r;
+#endif
switch (af) {
case AF_INET:
@@ -1414,8 +1416,10 @@
if (len < -1 || len > max)
errx(EXIT_FAILURE, "%s: bad value", s);
+#ifdef INET6
q = len >> 3;
r = len & 7;
+#endif
switch (af) {
case AF_INET:
memset(soup->so_mask, 0, sizeof(*soup->so_mask));
diff -r c8beef60e58b -r 98d3d7fc3d1a usr.sbin/lpr/common_source/Makefile
--- a/usr.sbin/lpr/common_source/Makefile Mon Dec 29 17:19:18 2014 +0000
+++ b/usr.sbin/lpr/common_source/Makefile Mon Dec 29 17:27:28 2014 +0000
@@ -1,8 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:32 lukem Exp $
+# $NetBSD: Makefile,v 1.11.40.1 2014/12/29 17:27:28 martin Exp $
+
+.include <bsd.own.mk>
LIBISPRIVATE= yes
LIB= common
SRCS= common.c common_vars.c displayq.c fatal.c rmjob.c startdaemon.c
+.if (${USE_INET6} != "no")
+CPPFLAGS.common.c= -DINET6
+.endif
+
.include <bsd.lib.mk>
diff -r c8beef60e58b -r 98d3d7fc3d1a usr.sbin/lpr/common_source/common.c
--- a/usr.sbin/lpr/common_source/common.c Mon Dec 29 17:19:18 2014 +0000
+++ b/usr.sbin/lpr/common_source/common.c Mon Dec 29 17:27:28 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.42 2013/11/13 21:19:17 christos Exp $ */
+/* $NetBSD: common.c,v 1.42.4.1 2014/12/29 17:27:28 martin Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: common.c,v 1.42 2013/11/13 21:19:17 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.42.4.1 2014/12/29 17:27:28 martin Exp $");
#endif
#endif /* not lint */
@@ -350,13 +350,15 @@
const char *
checkremote(void)
Home |
Main Index |
Thread Index |
Old Index