svn commit: r321008 - head/etc/rc.d
Author: manu
Date: Sat Jul 15 09:04:23 2017
New Revision: 321008
URL: https://svnweb.freebsd.org/changeset/base/321008
Log:
etc/rc.d: Only install ipfw_netflow is MK_IPFW and MK_NETGRAPH is defined
While here only install ipfw rc script if MK_IPFW is defined.
Reported by: ngie
Modified:
head/etc/rc.d/Makefile
Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Sat Jul 15 08:27:23 2017(r321007)
+++ head/etc/rc.d/Makefile Sat Jul 15 09:04:23 2017(r321008)
@@ -47,7 +47,6 @@ FILES=DAEMON \
ip6addrctl \
ipfilter \
ipfs \
- ipfw \
ipmon \
ipnat \
ipsec \
@@ -204,6 +203,13 @@ HASTPACKAGE= hast
.if ${MK_INETD} != "no"
FILES+=inetd
+.endif
+
+.if ${MK_IPFW} != "no"
+FILES+=ipfw
+.if ${MK_NETGRAPH} != "no"
+FILES+=ipfw_netflow
+.endif
.endif
.if ${MK_ISCSI} != "no"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r320944 - head/etc/rc.d
On Thu, 13 Jul 2017 08:44:36 -0700 Ngie Cooper wrote: > > > On Jul 13, 2017, at 06:40, Emmanuel Vadot wrote: > > > > Author: manu > > Date: Thu Jul 13 13:40:18 2017 > > New Revision: 320944 > > URL: https://svnweb.freebsd.org/changeset/base/320944 > > > > Log: > > Add an rc.d script to setup a netflow export via ng_netflow > > The default is to export netflow data on localhost on the netflow port. > > ngtee is used to have the lowest overhead possible. > > The ipfw ng hook is the netflow port (it can only be numeric) > > Default is netflow version 5. > > Hi Emmanuel, > The script isn't being installed. Could you please integrate it in to > etc/rc.d/Makefile under a block conditional on MK_IPFW/MK_NETGRAPH? > Thanks! > -Ngie Fixed in 321008, thanks! -- Emmanuel Vadot ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r321011 - head/lib/libthr/thread
Author: pfg Date: Sat Jul 15 15:00:13 2017 New Revision: 321011 URL: https://svnweb.freebsd.org/changeset/base/321011 Log: libthr: check for possible overflow in the pthread_barrier_init() count. Following up on r320900, where the check for negative count values was removed, add a check to prevent integer overflow. This is to account that b_count, b_waiters but most importantly the total number of threads in the system are signed values. Discussed with: kib MFC after:2 weeks Modified: head/lib/libthr/thread/thr_barrier.c Modified: head/lib/libthr/thread/thr_barrier.c == --- head/lib/libthr/thread/thr_barrier.cSat Jul 15 14:57:24 2017 (r321010) +++ head/lib/libthr/thread/thr_barrier.cSat Jul 15 15:00:13 2017 (r321011) @@ -100,7 +100,7 @@ _pthread_barrier_init(pthread_barrier_t *barrier, pthread_barrier_t bar; int pshared; - if (barrier == NULL || count == 0) + if (barrier == NULL || count == 0 || count > INT_MAX) return (EINVAL); if (attr == NULL || *attr == NULL || ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r321015 - head/sys/amd64/amd64
Author: alc
Date: Sat Jul 15 16:42:55 2017
New Revision: 321015
URL: https://svnweb.freebsd.org/changeset/base/321015
Log:
Style-only change: Consistently use the variable name "pdpg" throughout
this file. Previously, half of the pointers to a vm_page being used as
a page directory page were named "pdpg" and the rest were named "mpde".
Discussed with: kib
MFC after:1 week
Modified:
head/sys/amd64/amd64/pmap.c
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Sat Jul 15 15:26:38 2017(r321014)
+++ head/sys/amd64/amd64/pmap.c Sat Jul 15 16:42:55 2017(r321015)
@@ -4556,23 +4556,23 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t
{
pd_entry_t *pde, newpde;
pt_entry_t PG_V;
- vm_page_t mpde;
+ vm_page_t pdpg;
struct spglist free;
PG_V = pmap_valid_bit(pmap);
PMAP_LOCK_ASSERT(pmap, MA_OWNED);
- if ((mpde = pmap_allocpde(pmap, va, NULL)) == NULL) {
+ if ((pdpg = pmap_allocpde(pmap, va, NULL)) == NULL) {
CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx"
" in pmap %p", va, pmap);
return (FALSE);
}
- pde = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(mpde));
+ pde = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pdpg));
pde = &pde[pmap_pde_index(va)];
if ((*pde & PG_V) != 0) {
- KASSERT(mpde->wire_count > 1,
- ("pmap_enter_pde: mpde's wire count is too low"));
- mpde->wire_count--;
+ KASSERT(pdpg->wire_count > 1,
+ ("pmap_enter_pde: pdpg's wire count is too low"));
+ pdpg->wire_count--;
CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx"
" in pmap %p", va, pmap);
return (FALSE);
@@ -4588,7 +4588,7 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t
if (!pmap_pv_insert_pde(pmap, va, VM_PAGE_TO_PHYS(m),
lockp)) {
SLIST_INIT(&free);
- if (pmap_unwire_ptp(pmap, va, mpde, &free)) {
+ if (pmap_unwire_ptp(pmap, va, pdpg, &free)) {
/*
* Although "va" is not mapped, paging-
* structure caches could nonetheless have
@@ -5013,6 +5013,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_
vm_offset_t addr;
vm_offset_t end_addr = src_addr + len;
vm_offset_t va_next;
+ vm_page_t dst_pdpg, dstmpte, srcmpte;
pt_entry_t PG_A, PG_M, PG_V;
if (dst_addr != src_addr)
@@ -5047,7 +5048,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_
for (addr = src_addr; addr < end_addr; addr = va_next) {
pt_entry_t *src_pte, *dst_pte;
- vm_page_t dstmpde, dstmpte, srcmpte;
pml4_entry_t *pml4e;
pdp_entry_t *pdpe;
pd_entry_t srcptepaddr, *pde;
@@ -5083,11 +5083,11 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_
if (srcptepaddr & PG_PS) {
if ((addr & PDRMASK) != 0 || addr + NBPDR > end_addr)
continue;
- dstmpde = pmap_allocpde(dst_pmap, addr, NULL);
- if (dstmpde == NULL)
+ dst_pdpg = pmap_allocpde(dst_pmap, addr, NULL);
+ if (dst_pdpg == NULL)
break;
pde = (pd_entry_t *)
- PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpde));
+ PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dst_pdpg));
pde = &pde[pmap_pde_index(addr)];
if (*pde == 0 && ((srcptepaddr & PG_MANAGED) == 0 ||
pmap_pv_insert_pde(dst_pmap, addr, srcptepaddr &
@@ -5096,7 +5096,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_
pmap_resident_count_inc(dst_pmap, NBPDR /
PAGE_SIZE);
atomic_add_long(&pmap_pde_mappings, 1);
} else
- dstmpde->wire_count--;
+ dst_pdpg->wire_count--;
continue;
}
@@ -6447,8 +6447,8 @@ pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_of
pdp_entry_t newpdpe, oldpdpe;
pd_entry_t *firstpde, newpde, *pde;
pt_entry_t PG_A, PG_M, PG_RW, PG_V;
- vm_paddr_t mpdepa;
- vm_page_t mpde;
+ vm_paddr_t pdpgpa;
+ vm_page_t pdpg;
PG_A = pmap_accessed_bit(pmap);
PG_M = pmap_modified_bit(pmap);
@@ -6459,15 +6459,15 @@ pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_of
oldpdpe = *pdpe;
KASSERT((old
svn commit: r321023 - head/usr.sbin/ctladm
Author: bcr (doc committer) Date: Sat Jul 15 17:59:28 2017 New Revision: 321023 URL: https://svnweb.freebsd.org/changeset/base/321023 Log: The ctladm man page incorrectly duplicated the text for the delete subcommand in the modify section. Rewrite the modify description text in two places to say modify/modified instead of remove/removed. PR: 220710 Submitted by: sseek...@risei.net Reviewed by: mav@ MFC after:1 week Differential Revision:https://reviews.freebsd.org/D11608 Modified: head/usr.sbin/ctladm/ctladm.8 Modified: head/usr.sbin/ctladm/ctladm.8 == --- head/usr.sbin/ctladm/ctladm.8 Sat Jul 15 17:44:29 2017 (r321022) +++ head/usr.sbin/ctladm/ctladm.8 Sat Jul 15 17:59:28 2017 (r321023) @@ -35,7 +35,7 @@ .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $ .\" $FreeBSD$ .\" -.Dd January 23, 2017 +.Dd July 15, 2017 .Dt CTLADM 8 .Os .Sh NAME @@ -751,13 +751,13 @@ Modify a LUN size. The backend, the LUN number, and the size must be specified. .Bl -tag -width 14n .It Fl b Ar backend -Specify the backend that owns the LUN to be removed. +Specify the backend that owns the LUN to be modified. Examples are .Dq ramdisk and .Dq block . .It Fl l Ar lun_id -Specify the LUN number to remove. +Specify the LUN number to modify. .It Fl o Ar name=value Specify a backend-specific name/value pair. Multiple ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r321030 - in head: etc/mtree sbin/pfctl sbin/pfctl/tests sbin/pfctl/tests/files targets/pseudo/tests
Author: kp Date: Sat Jul 15 19:22:01 2017 New Revision: 321030 URL: https://svnweb.freebsd.org/changeset/base/321030 Log: pfctl parser tests Copy the most important test cases from OpenBSD's corresponding src/regress/sbin/pfctl, those that run pfctl on a test input file and check correctness of its output. We have also added some new tests using the same format. The tests consist of a collection of input files (pf*.in) and corresponding output files (pf*.ok). We run pfctl -nv on the input files and check that the output matches the output files. If any discrepancy is discovered during future development in the source tree, we know that a regression bug has been introduced into the tree. Submitted by: paggas Sponsored by: Google, Inc (GSoC 2017) Differential Revision:https://reviews.freebsd.org/D11322 Added: head/sbin/pfctl/tests/ head/sbin/pfctl/tests/Makefile (contents, props changed) head/sbin/pfctl/tests/files/ head/sbin/pfctl/tests/files/Makefile (contents, props changed) head/sbin/pfctl/tests/files/pf0001.in (contents, props changed) head/sbin/pfctl/tests/files/pf0001.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0002.in (contents, props changed) head/sbin/pfctl/tests/files/pf0002.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0003.in (contents, props changed) head/sbin/pfctl/tests/files/pf0003.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0004.in (contents, props changed) head/sbin/pfctl/tests/files/pf0004.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0005.in (contents, props changed) head/sbin/pfctl/tests/files/pf0005.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0006.in (contents, props changed) head/sbin/pfctl/tests/files/pf0006.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0007.in (contents, props changed) head/sbin/pfctl/tests/files/pf0007.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0008.in (contents, props changed) head/sbin/pfctl/tests/files/pf0008.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0009.in (contents, props changed) head/sbin/pfctl/tests/files/pf0009.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0010.in (contents, props changed) head/sbin/pfctl/tests/files/pf0010.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0011.in (contents, props changed) head/sbin/pfctl/tests/files/pf0011.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0012.in (contents, props changed) head/sbin/pfctl/tests/files/pf0012.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0013.in (contents, props changed) head/sbin/pfctl/tests/files/pf0013.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0014.in (contents, props changed) head/sbin/pfctl/tests/files/pf0014.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0016.in (contents, props changed) head/sbin/pfctl/tests/files/pf0016.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0018.in (contents, props changed) head/sbin/pfctl/tests/files/pf0018.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0019.in (contents, props changed) head/sbin/pfctl/tests/files/pf0019.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0020.in (contents, props changed) head/sbin/pfctl/tests/files/pf0020.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0022.in (contents, props changed) head/sbin/pfctl/tests/files/pf0022.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0023.in (contents, props changed) head/sbin/pfctl/tests/files/pf0023.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0024.in (contents, props changed) head/sbin/pfctl/tests/files/pf0024.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0025.in (contents, props changed) head/sbin/pfctl/tests/files/pf0025.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0026.in (contents, props changed) head/sbin/pfctl/tests/files/pf0026.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0028.in (contents, props changed) head/sbin/pfctl/tests/files/pf0028.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0030.in (contents, props changed) head/sbin/pfctl/tests/files/pf0030.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0031.in (contents, props changed) head/sbin/pfctl/tests/files/pf0031.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0032.in (contents, props changed) head/sbin/pfctl/tests/files/pf0032.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0034.in (contents, props changed) head/sbin/pfctl/tests/files/pf0034.ok (contents, props changed) head/sbin/pfctl/tests/files/pf0035.in (contents, props changed) head/sbin/pfctl/tests/files/pf0035.ok (contents, props changed) head/
svn commit: r321034 - head/sys/netinet
Author: tuexen
Date: Sat Jul 15 19:54:03 2017
New Revision: 321034
URL: https://svnweb.freebsd.org/changeset/base/321034
Log:
Fix the handling of Explicit EOR mode.
While there, appropriately handle the overhead depending on
the usage of DATA or I-DATA chunks. Take the overhead only
into account, when required.
Joint work with rrs@
MFC after:1 week
Modified:
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_output.h
Modified: head/sys/netinet/sctp_output.c
==
--- head/sys/netinet/sctp_output.c Sat Jul 15 19:52:59 2017
(r321033)
+++ head/sys/netinet/sctp_output.c Sat Jul 15 19:54:03 2017
(r321034)
@@ -6250,11 +6250,7 @@ sctp_get_frag_point(struct sctp_tcb *stcb,
} else {
ovh = SCTP_MIN_V4_OVERHEAD;
}
- if (stcb->asoc.idata_supported) {
- ovh += sizeof(struct sctp_idata_chunk);
- } else {
- ovh += sizeof(struct sctp_data_chunk);
- }
+ ovh += SCTP_DATA_CHUNK_OVERHEAD(stcb);
if (stcb->asoc.sctp_frag_point > asoc->smallest_mtu)
siz = asoc->smallest_mtu - ovh;
else
@@ -6759,7 +6755,7 @@ sctp_sendall_iterator(struct sctp_inpcb *inp, struct s
}
}
un_sent = ((stcb->asoc.total_output_queue_size -
stcb->asoc.total_flight) +
- (stcb->asoc.stream_queue_cnt * sizeof(struct sctp_data_chunk)));
+ (stcb->asoc.stream_queue_cnt * SCTP_DATA_CHUNK_OVERHEAD(stcb)));
if ((sctp_is_feature_off(inp, SCTP_PCB_FLAGS_NODELAY)) &&
(stcb->asoc.total_flight > 0) &&
@@ -7459,11 +7455,7 @@ dont_do_it:
} else {
atomic_subtract_int(&sp->length, to_move);
}
- if (stcb->asoc.idata_supported == 0) {
- leading = sizeof(struct sctp_data_chunk);
- } else {
- leading = sizeof(struct sctp_idata_chunk);
- }
+ leading = SCTP_DATA_CHUNK_OVERHEAD(stcb);
if (M_LEADINGSPACE(chk->data) < leading) {
/* Not enough room for a chunk header, get some */
struct mbuf *m;
@@ -7505,11 +7497,7 @@ dont_do_it:
M_ALIGN(chk->data, 4);
}
}
- if (stcb->asoc.idata_supported == 0) {
- SCTP_BUF_PREPEND(chk->data, sizeof(struct sctp_data_chunk),
M_NOWAIT);
- } else {
- SCTP_BUF_PREPEND(chk->data, sizeof(struct sctp_idata_chunk),
M_NOWAIT);
- }
+ SCTP_BUF_PREPEND(chk->data, SCTP_DATA_CHUNK_OVERHEAD(stcb), M_NOWAIT);
if (chk->data == NULL) {
/* HELP, TSNH since we assured it would not above? */
#ifdef INVARIANTS
@@ -7522,13 +7510,8 @@ dont_do_it:
to_move = 0;
goto out_of;
}
- if (stcb->asoc.idata_supported == 0) {
- sctp_snd_sb_alloc(stcb, sizeof(struct sctp_data_chunk));
- chk->book_size = chk->send_size = (uint16_t)(to_move +
sizeof(struct sctp_data_chunk));
- } else {
- sctp_snd_sb_alloc(stcb, sizeof(struct sctp_idata_chunk));
- chk->book_size = chk->send_size = (uint16_t)(to_move +
sizeof(struct sctp_idata_chunk));
- }
+ sctp_snd_sb_alloc(stcb, SCTP_DATA_CHUNK_OVERHEAD(stcb));
+ chk->book_size = chk->send_size = (uint16_t)(to_move +
SCTP_DATA_CHUNK_OVERHEAD(stcb));
chk->book_size_scale = 0;
chk->sent = SCTP_DATAGRAM_UNSENT;
@@ -7728,11 +7711,7 @@ sctp_fill_outqueue(struct sctp_tcb *stcb,
break;
}
/* Need an allowance for the data chunk header too */
- if (stcb->asoc.idata_supported == 0) {
- space_left -= sizeof(struct sctp_data_chunk);
- } else {
- space_left -= sizeof(struct sctp_idata_chunk);
- }
+ space_left -= SCTP_DATA_CHUNK_OVERHEAD(stcb);
/* must make even word boundary */
space_left &= 0xfffc;
@@ -7749,18 +7728,10 @@ sctp_fill_outqueue(struct sctp_tcb *stcb,
strq = stcb->asoc.ss_functions.sctp_ss_select_stream(stcb, net,
asoc);
total_moved += moved;
space_left -= moved;
- if (stcb->asoc.idata_supported == 0) {
- if (space_left >= sizeof(struct sctp_data_chunk)) {
- space_left -= sizeof(struct sctp_data_chunk);
- } else {
- space_left = 0;
- }
+ if (space_left >= SCTP_DATA_CHUNK_OVERHEAD(stcb)) {
+ space_left -= SCTP_DATA_CHUNK_OVERHEAD(stcb);
} else {
- if (space_left >= sizeof(struct sctp_idata_chunk)) {
- space_left -= sizeof(struct sctp_idata_chunk);
- } else {
- space_left = 0;
- }
+
svn commit: r321035 - in head: sbin/savecore sys/kern
Author: markj
Date: Sat Jul 15 20:53:08 2017
New Revision: 321035
URL: https://svnweb.freebsd.org/changeset/base/321035
Log:
Revert r320918 and have mkdumpheader() handle version string truncation.
Reported by: jhb
MFC after:1 week
Modified:
head/sbin/savecore/savecore.c
head/sys/kern/kern_shutdown.c
Modified: head/sbin/savecore/savecore.c
==
--- head/sbin/savecore/savecore.c Sat Jul 15 19:54:03 2017
(r321034)
+++ head/sbin/savecore/savecore.c Sat Jul 15 20:53:08 2017
(r321035)
@@ -119,7 +119,7 @@ printheader(xo_handle_t *xo, const struct kerneldumphe
xo_emit_h(xo, "{P: }{Lwc:Dumptime}{:dumptime/%s}", ctime(&t));
xo_emit_h(xo, "{P: }{Lwc:Hostname}{:hostname/%s}\n", h->hostname);
xo_emit_h(xo, "{P: }{Lwc:Magic}{:magic/%s}\n", h->magic);
- xo_emit_h(xo, "{P: }{Lwc:Version String}{:version_string/%s}\n",
h->versionstring);
+ xo_emit_h(xo, "{P: }{Lwc:Version String}{:version_string/%s}",
h->versionstring);
xo_emit_h(xo, "{P: }{Lwc:Panic String}{:panic_string/%s}\n",
h->panicstring);
xo_emit_h(xo, "{P: }{Lwc:Dump Parity}{:dump_parity/%u}\n", h->parity);
xo_emit_h(xo, "{P: }{Lwc:Bounds}{:bounds/%d}\n", bounds);
Modified: head/sys/kern/kern_shutdown.c
==
--- head/sys/kern/kern_shutdown.c Sat Jul 15 19:54:03 2017
(r321034)
+++ head/sys/kern/kern_shutdown.c Sat Jul 15 20:53:08 2017
(r321035)
@@ -1229,6 +1229,7 @@ void
mkdumpheader(struct kerneldumpheader *kdh, char *magic, uint32_t archver,
uint64_t dumplen, uint32_t dumpkeysize, uint32_t blksz)
{
+ size_t dstsize;
bzero(kdh, sizeof(*kdh));
strlcpy(kdh->magic, magic, sizeof(kdh->magic));
@@ -1240,7 +1241,9 @@ mkdumpheader(struct kerneldumpheader *kdh, char *magic
kdh->dumpkeysize = htod32(dumpkeysize);
kdh->blocksize = htod32(blksz);
strlcpy(kdh->hostname, prison0.pr_hostname, sizeof(kdh->hostname));
- strlcpy(kdh->versionstring, version, sizeof(kdh->versionstring));
+ dstsize = sizeof(kdh->versionstring);
+ if (strlcpy(kdh->versionstring, version, dstsize) >= dstsize)
+ kdh->versionstring[dstsize - 2] = '\n';
if (panicstr != NULL)
strlcpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring));
kdh->parity = kerneldump_parity(kdh);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r321036 - in head: contrib/bmake contrib/bmake/mk usr.bin/bmake
Author: sjg
Date: Sat Jul 15 21:19:27 2017
New Revision: 321036
URL: https://svnweb.freebsd.org/changeset/base/321036
Log:
Import bmake-20170711
Modified:
head/contrib/bmake/ChangeLog
head/contrib/bmake/Makefile
head/contrib/bmake/bmake.1
head/contrib/bmake/bmake.cat1
head/contrib/bmake/buf.h
head/contrib/bmake/dir.h
head/contrib/bmake/hash.h
head/contrib/bmake/main.c
head/contrib/bmake/make.1
head/contrib/bmake/meta.c
head/contrib/bmake/mk/ChangeLog
head/contrib/bmake/mk/dirdeps.mk
head/contrib/bmake/mk/install-mk
head/contrib/bmake/mk/lib.mk
head/contrib/bmake/mk/meta.stage.mk
head/contrib/bmake/mk/meta.sys.mk
head/contrib/bmake/mk/meta2deps.py
head/contrib/bmake/mk/own.mk
head/contrib/bmake/sprite.h
head/usr.bin/bmake/Makefile
Directory Properties:
head/contrib/bmake/ (props changed)
Modified: head/contrib/bmake/ChangeLog
==
--- head/contrib/bmake/ChangeLogSat Jul 15 20:53:08 2017
(r321035)
+++ head/contrib/bmake/ChangeLogSat Jul 15 21:19:27 2017
(r321036)
@@ -1,3 +1,16 @@
+2017-07-11 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170711
+ forgot to update after merge on 20170708 ;-)
+ o main.c: refactor to reduce size of main function.
+ add -v option to always fully expand values.
+ o meta.c: ensure command output in meta file has ending newline
+ even when filemon not being used.
+ When matching ${.MAKE.META.IGNORE_PATTERNS} do not use
+ pathname via ':L' since any ':' in pathname breaks that.
+ Instead set a '${.p.}' to pathname in the target context and
+ use that.
+
2017-05-10 Simon J. Gerraty
* Makefile (_MAKE_VERSION): 20170510
Modified: head/contrib/bmake/Makefile
==
--- head/contrib/bmake/Makefile Sat Jul 15 20:53:08 2017(r321035)
+++ head/contrib/bmake/Makefile Sat Jul 15 21:19:27 2017(r321036)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.92 2017/05/10 22:29:04 sjg Exp $
+# $Id: Makefile,v 1.94 2017/07/15 18:22:14 sjg Exp $
# Base version on src date
-_MAKE_VERSION= 20170510
+_MAKE_VERSION= 20170711
PROG= bmake
Modified: head/contrib/bmake/bmake.1
==
--- head/contrib/bmake/bmake.1 Sat Jul 15 20:53:08 2017(r321035)
+++ head/contrib/bmake/bmake.1 Sat Jul 15 21:19:27 2017(r321036)
@@ -1,4 +1,4 @@
-.\"$NetBSD: make.1,v 1.266 2017/02/01 18:39:27 sjg Exp $
+.\"$NetBSD: make.1,v 1.271 2017/07/03 21:34:20 wiz Exp $
.\"
.\" Copyright (c) 1990, 1993
.\"The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\"from: @(#)make.18.4 (Berkeley) 3/19/94
.\"
-.Dd February 1, 2017
+.Dd June 22, 2017
.Dt BMAKE 1
.Os
.Sh NAME
@@ -48,6 +48,7 @@
.Op Fl m Ar directory
.Op Fl T Ar file
.Op Fl V Ar variable
+.Op Fl v Ar variable
.Op Ar variable=value
.Op Ar target ...
.Sh DESCRIPTION
@@ -206,7 +207,9 @@ Print debugging information about target list maintena
.It Ar V
Force the
.Fl V
-option to print raw values of variables.
+option to print raw values of variables, overriding the default behavior
+set via
+.Va .MAKE.EXPAND_VARIABLES .
.It Ar v
Print debugging information about variable assignment.
.It Ar x
@@ -334,20 +337,39 @@ for each job started and completed.
Rather than re-building a target as specified in the makefile, create it
or update its modification time to make it appear up-to-date.
.It Fl V Ar variable
-Print
-.Nm Ns 's
-idea of the value of
-.Ar variable ,
-in the global context.
+Print the value of
+.Ar variable .
Do not build any targets.
Multiple instances of this option may be specified;
the variables will be printed one per line,
with a blank line for each null or undefined variable.
+The value printed is extracted from the global context after all
+makefiles have been read.
+By default, the raw variable contents (which may
+include additional unexpanded variable references) are shown.
If
.Ar variable
contains a
.Ql \&$
-then the value will be expanded before printing.
+then the value will be recursively expanded to its complete resultant
+text before printing.
+The expanded value will also be printed if
+.Va .MAKE.EXPAND_VARIABLES
+is set to true and
+the
+.Fl dV
+option has not been used to override it.
+Note that loop-local and target-local variables, as well as values
+taken temporarily by global variables during makefile processing, are
+not accessible via this option.
+The
+.Fl dv
+debug mode can be used to see these at the cost of generating
+substantial extraneous output.
+.It Fl v Ar variable
+Like
+.Fl V
+but the variable is always expanded to its complete value.
.It Fl W
Treat any warnings during makefile parsing as errors.
.It Fl w
@@ -6
