undo unintended commit

(christos)

undo unintended commit

(christos)

Elide unused variable warnings (Felix Deichmann)

(christos)

Use the right variable (Felix Deichmann)

(christos)

Propagate PLT fix from our gcc-5.3 tree:

Some functions like __udivsi3 are used in other assembly files like __umodsi3.
Use PLT linkage to avoid text relocations.

XXX: pullup-7

(christos)

Undo previous; wrong tree.

(christos)

Propagate PLT fix from our gcc-5.3 tree:

Some functions like __udivsi3 are used in other assembly files like __umodsi3.
Use PLT linkage to avoid text relocations.

XXX: pullup-7

(christos)

Print the symbol that caused the text relocation for m68k like we do for
other platforms.

(christos)

Some functions like __udivsi3 are used in other assembly files like __umodsi3.
Use PLT linkage to avoid text relocations.

(christos)

Sync with HEAD

(skrll)

Report what error was if nonzero with KASSERTMSG.

(riastradh)

Sync with HEAD

(skrll)

Add more tests of RTF_REJECT

(ozaki-r)

#if DIAGNOSTIC panic ---> KASSERTMSG

(riastradh)

mknative for GCC 5.3 and *arm* after netbsd-elf.h order fix.

(mrg)

Change used from int to bool.
If used, abort the loop because we think we're already at the end.

(roy)

MLD: multicast listener discovery

(riastradh)

cgfourteen needs vcons

(macallan)

fix some tpyos, add some comments

(macallan)

more RASTERCONSOLE purging

(macallan)

RASTERCONSOLE is gone, wsdisplay no longer optional

(macallan)

RASTERCONSOLE is no more

(macallan)

Re-order includes so that ARM_TARGET2_DWARF_FORMAT takes effect

Fixes PR/51066: C++ text relocations

(skrll)

autoconf(9) requires the kernel_lock so take it while discovering new
devices.

PR/51081: calling ioctl while attaching wifi device causes a jump to NULL

(skrll)

Note ticket #1378

(martin)

Pull up following revision(s) (requested by christos in ticket #1378):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.42
Memory leak, triggerable from an unprivileged user.

(martin)

Note ticket #1378

(martin)

Pull up following revision(s) (requested by christos in ticket #1378):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.42
Memory leak, triggerable from an unprivileged user.

(martin)

Note ticket #1378

(martin)

Pull up following revision(s) (requested by christos in ticket #1378):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.42
Memory leak, triggerable from an unprivileged user.

(martin)

Fix tests for blackhole routes

The gateway of a blackhole route must be a loopback interface.

(ozaki-r)

regenerate mknative-gcc for GCC 4.8 and *arm*

(mrg)

set _OUTDIR and _OUTDIRBASE properly for gcc.old, and fix a sed.

(mrg)

Add tests of route flags using IPv6 addresses

(ozaki-r)

Fix RTF_{REJECT,BLACKHOLE} behavior for IPv6 routes

We still need a nexthop route to reflect RTF_{REJECT,BLACKHOLE}.
In the future, we would do it w/o looking up a route.

(ozaki-r)

WARNS=1

(christos)

/32 and /128 are valid netmasks.

(christos)

Don't subtract base if not pie.

(christos)

IFQ_ENQUEUE refactor (3/3) : eliminate pktattr argument from IFQ_ENQUEUE caller

(knakahara)

IFQ_ENQUEUE refactor (2/3) : eliminate pktattr argument from altq implemantation

(knakahara)

IFQ_ENQUEUE refactor (1/3) : add altq_pktattr fields to m_pkthdr

Reviewed by joerg@n.o and tls@n.o, thanks.

(knakahara)

Note import of dhcpcd-6.10.3

(roy)

Apply mbuf initialize function to stack mbuf used as M_PKTHDR.

It is required to prevent unexpected behavior in future works abount m_pkthdr.

(knakahara)

Sync

(roy)

Add init function for mbuf.

some functions use mbuf as stack variable instead of allocating by m_get().
They should use this function(s) to prevent access to uninitialized fields.

Currently, the mbuf stack allocating functions are the following.
    + sys/dev/ic/bwi.c
      - bwi_rxeof()
      - bwi_encap()
    + sys/dev/ic/dp8390.c
      - dp8390_ipkdb_send()
    + sys/dev/pci/if_txp.c
      - txp_download_fw_section()
    + sys/dev/ppbus/if_plip.c
      - lptap()
    + sys/net/bpf.c
      - _pf_mtap2()
      - _pf_mtap_af()
      - _pf_mtap_sl_out()
    + sys/netisdn/i4b_ipr.c
      - ipr_rx_data_rdy()
      - ipr_tx_queue_empty()

Reviewed by kre@n.o and christos@n.o, thanks.

(knakahara)

Re-order includes so that ARM_TARGET2_DWARF_FORMAT takes effect

Fixes PR/51066: C++ text relocations

(skrll)

The gcc diagnostic formats handle %m

(christos)

Enable minimal warnings, disabling the unused and narrowing ones that gcc
authors don't seem to pay attention to.

(christos)

From Ingo Schwarze:
- Put the data type el_rfunc_t into the public header <histedit.h>.
- Make el_read in struct editline an opaque pointer rather
  than an embedded struct.
- Do not include "read.h" everywhere, but only in the two files
  needing access to el_read, read.c and el.c.
- To functions that don't need more, pass the struct el_read_t *
  rather than the full EditLine *.
- Of course, that means that read_init() can now fail from
  memory exhaustion, but it's easy to clean up after that.

(christos)

regen

(nonaka)

Added Buffalo WI-U2-300D.

(nonaka)

OVERO's .ub file includes release

(kiyohara)

Fix error path

(ozaki-r)

Separate MPLS-related routines from ip_hresolv_output

No functional changes.

(ozaki-r)

Apply psref(9) to bridge(4)

Note that there is an issue that ioctls for an interface and a destruction
of the interface can run in parallel and it causes race conditions on
bridge as well (it rarely happens). The issue will be addressed in the
interface common code (if.c).

(ozaki-r)

Remove BRIDGE_MPSAFE switch and enable MP-safe code by default

We need to enable it by default because bridge_input now runs
in softint, but bridge_input w/o BRIDGE_MPSAFE was designed as
it runs in hardware interrupt.

Note that there remains a racy code in bridge_output; it will be
solved in the upcoming change (applying psref(9)).

(ozaki-r)

revert rev 1.6.  we don't have access to those files as normal files
and possible will get them directly elsewhere soon.

(if i hack my nouveau to ignore fireware failure, it end up having
a vaguely working console and slowly working X, which is better than
the current situation.)

(mrg)

Prevent LWP migrations between CPUs during upper layer processing

This is a contract of psref(9) that is used by upper layer componenets,
e.g., bridge(4).

(ozaki-r)

Constify rtentry of arpresolve

We don't need to (rather shouldn't) modify rtentry in there.

(ozaki-r)

Make sure rbtrees are empty on desctruction.

If related to PR kern/51076, might help catch the bug a bit earlier.

(riastradh)

be more specific about what needs to be cleaned for libedit.

(christos)

mention libedit

(christos)

From Ingo Schwarze:
* Replace fcns.c by a shorter and simpler func.h
  and include it only in the one file needing it, map.c.
* Combine help.h and help.c into a simplified help.h
  and include it only in the one file needing it, map.c.
* Check the very simple, static files editline.c, historyn.c, and
  tokenizern.c into CVS rather than needlessly generating them.
* So we no longer autogenerate any C files.  :-)
* Shorten and simplify makelist by deleting the options -n, -e, -bc,
  and -m; the latter was unused and useless in the first place.
* Move the declaration of el_func_t from fcns.h to the header
  actually needing it, map.h.  Since that header is already
  included by el.h for unrelated reasons, that makes el_func_t
  just as globally available as before.
* No longer include the simplified fcns.h into el.h,
  include it directly into the *.c files needing it.

(christos)

Add a test case for static ARP

It tests receiving an ARP request that has a spa (i.e., IP address) whose
ARP entry already exists in the table as a static ARP entry.

(ozaki-r)

Fix panic on receiving an ARP request

The panic happened if an ARP request has a spa (i.e., IP address) whose
ARP entry already exists in the table as a static ARP entry.

(ozaki-r)

Get rid of meaningless RTF_UP check from ip_hresolv_output

The check is meaningless because
- An obtained rtentry is ensured that it's always RTF_UP by rtcache,
  rtalloc1 and rtlookup. If the rtentry isn't changed (i.e., RTF_UP gets
  dropped) during processing, the check should be unnecessary
- Even if not, i.e., an obtained rtentry can be changed during processing,
  checking only at the point doesn't help; the rtentry can be changed after
  the check

Instead we have to ensure that RTF_UP isn't dropped if someone is using it
somehow. Note that we already ensure that a rtentry being used isn't freed
by rt_refcnt.

Proposed on tech-kern and tech-net.

(ozaki-r)

Update sparc64 TODO file: note issue with interrupt handling + issue when booting from iso image

(palle)

Remove empty callbacks (Ingo Schwartze)

(christos)

Move the SMP-disabled hack for SUN4V a bit earlier

(martin)

Fix NetBSD RCS keyword.

(nakayama)

merge 1141 addition

(snj)

merge 1141 addition

(snj)

mereg 1377 addition

(snj)

merge 1377 addition

(snj)

merge 1377 addition

(snj)

Use xorg-pkg-ver.mk to retrieve PACKAGE_STRING.

(nakayama)

Note that deleting objdirs (not just cleandir) may be necessary for the
gcc update.

(dholland)

Add a note about PIE for amd64 requiring clean objdir.

(riastradh)

Set PACKAGE_STRING properly.

(nakayama)

Fix usbd_status vs int in *_alloc_*_chain

(skrll)

Don't leak memory in *_alloc_*td_chain if allocation fails.

(skrll)

Explicitly initialise up_serialise to true

(skrll)

KNF

(skrll)

Remove an unnecessary ux_hcpriv assignment
$CVS: ----------------------------------------------------------------------

(skrll)

Remove an unnecessary ux_hcpriv assignement

(skrll)

Whitespcae

(skrll)

Prefix ucom_attach_args struct members with ucaa_ and rename variables
for consistency.

No functional change.

(skrll)

If compiling with SUN4V support, bump MAXCPUS to 256.

(martin)

Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/cgi-bozo.c                        1.34

use %zu instead of %lu for size_t.

(ok snj@)

(mrg)

Pull up following revision(s) (requested by mrg in ticket #1141):
libexec/httpd/cgi-bozo.c                        1.34

use %zu instead of %lu for size_t.

(ok snj@)

(mrg)

Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/cgi-bozo.c                        1.34

use %zu instead of %lu for size_t.

(ok snj@)

(mrg)

Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/cgi-bozo.c                        1.34

use %zu instead of %lu for size_t.

(ok snj@)

(mrg)

Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/cgi-bozo.c                        1.34

use %zu instead of %lu for size_t.

(ok snj@)

(mrg)

use %zu instead of %lu for size_t.

(mrg)

1377

(snj)

Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/CHANGES: up to 1.22
libexec/httpd/Makefile: up to 1.26 via patch
libexec/httpd/auth-bozo.c: up to 1.18
libexec/httpd/bozohttpd.8: up to 1.59
libexec/httpd/bozohttpd.c: up to 1.80 via patch
libexec/httpd/bozohttpd.h: up to 1.45
libexec/httpd/cgi-bozo.c: up to 1.33
libexec/httpd/content-bozo.c: up to 1.13
libexec/httpd/daemon-bozo.c: up to 1.17
libexec/httpd/dir-index-bozo.c: up to 1.25
libexec/httpd/lua-bozo.c: up to 1.14
libexec/httpd/lua/bozo.lua: up to 1.2
libexec/httpd/lua/glue.c: up to 1.2
libexec/httpd/main.c: up to 1.13
libexec/httpd/printenv.lua: up to 1.3
libexec/httpd/ssl-bozo.c: up to 1.22
libexec/httpd/testsuite/Makefile: up to 1.5
libexec/httpd/testsuite/t10.out: up to 1.2
libexec/httpd/testsuite/test-bigfile: up to 1.2
libexec/httpd/tilde-luzah-bozo.c: up to 1.14
Import bozohttpd 20151028:
o  add CGI support for ~user translation (-E switch)
o  add redirects to ~user translation
o  fix bugs around ~user translation
o  add schema detection for absolute redirects
o  fixed few memory leaks
o  bunch of minor tweaks
o  removed -r support
o  smarter redirects
--
Changes in 20150320:
o  fix redirection handling
o  support transport stream (.ts) and video object (.vob) files
o  directory listings show correct file sizes for large files
--
updates and bozohttpd 20160415:
o  add search-word support for CGI
o  fix a security issue in CGI suffix handler support which would
  allow remote code execution, from shm@netbsd.org
o  -C option supports now CGI scripts only

(snj)

1377

(snj)

Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/CHANGES: up to 1.22
libexec/httpd/Makefile: up to 1.26 via patch
libexec/httpd/auth-bozo.c: up to 1.18
libexec/httpd/bozohttpd.8: up to 1.59
libexec/httpd/bozohttpd.c: up to 1.80 via patch
libexec/httpd/bozohttpd.h: up to 1.45
libexec/httpd/cgi-bozo.c: up to 1.33
libexec/httpd/content-bozo.c: up to 1.13
libexec/httpd/daemon-bozo.c: up to 1.17
libexec/httpd/dir-index-bozo.c: up to 1.25
libexec/httpd/lua-bozo.c: up to 1.14
libexec/httpd/lua/bozo.lua: up to 1.2
libexec/httpd/lua/glue.c: up to 1.2
libexec/httpd/main.c: up to 1.13
libexec/httpd/printenv.lua: up to 1.3
libexec/httpd/ssl-bozo.c: up to 1.22
libexec/httpd/testsuite/Makefile: up to 1.5
libexec/httpd/testsuite/t10.out: up to 1.2
libexec/httpd/testsuite/test-bigfile: up to 1.2
libexec/httpd/tilde-luzah-bozo.c: up to 1.14
Import bozohttpd 20151028:
o  add CGI support for ~user translation (-E switch)
o  add redirects to ~user translation
o  fix bugs around ~user translation
o  add schema detection for absolute redirects
o  fixed few memory leaks
o  bunch of minor tweaks
o  removed -r support
o  smarter redirects
--
Changes in 20150320:
o  fix redirection handling
o  support transport stream (.ts) and video object (.vob) files
o  directory listings show correct file sizes for large files
--
updates and bozohttpd 20160415:
o  add search-word support for CGI
o  fix a security issue in CGI suffix handler support which would
  allow remote code execution, from shm@netbsd.org
o  -C option supports now CGI scripts only

(snj)

1377

(snj)

Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/CHANGES: up to 1.22
libexec/httpd/Makefile: up to 1.26 via patch
libexec/httpd/auth-bozo.c: up to 1.18
libexec/httpd/bozohttpd.8: up to 1.59
libexec/httpd/bozohttpd.c: up to 1.80 via patch
libexec/httpd/bozohttpd.h: up to 1.45
libexec/httpd/cgi-bozo.c: up to 1.33
libexec/httpd/content-bozo.c: up to 1.13
libexec/httpd/daemon-bozo.c: up to 1.17
libexec/httpd/dir-index-bozo.c: up to 1.25
libexec/httpd/lua-bozo.c: up to 1.14
libexec/httpd/lua/bozo.lua: up to 1.2
libexec/httpd/lua/glue.c: up to 1.2
libexec/httpd/main.c: up to 1.13
libexec/httpd/printenv.lua: up to 1.3
libexec/httpd/ssl-bozo.c: up to 1.22
libexec/httpd/testsuite/Makefile: up to 1.5
libexec/httpd/testsuite/t10.out: up to 1.2
libexec/httpd/testsuite/test-bigfile: up to 1.2
libexec/httpd/tilde-luzah-bozo.c: up to 1.14
Import bozohttpd 20151028:
o  add CGI support for ~user translation (-E switch)
o  add redirects to ~user translation
o  fix bugs around ~user translation
o  add schema detection for absolute redirects
o  fixed few memory leaks
o  bunch of minor tweaks
o  removed -r support
o  smarter redirects
--
Changes in 20150320:
o  fix redirection handling
o  support transport stream (.ts) and video object (.vob) files
o  directory listings show correct file sizes for large files
--
updates and bozohttpd 20160415:
o  add search-word support for CGI
o  fix a security issue in CGI suffix handler support which would
  allow remote code execution, from shm@netbsd.org
o  -C option supports now CGI scripts only

(snj)

update ticket 1141

(snj)

Pull up following revision(s) (requested by mrg in ticket #1141):
libexec/httpd/CHANGES: up to 1.22
libexec/httpd/bozohttpd.8: up to 1.59
libexec/httpd/bozohttpd.c: up to 1.80
libexec/httpd/bozohttpd.h: up to 1.45
libexec/httpd/cgi-bozo.c: up to 1.33
libexec/httpd/lua/bozo.lua: up to 1.2
libexec/httpd/lua/glue.c: up to 1.2
Import bozohttpd 20151028:
o  add CGI support for ~user translation (-E switch)
o  add redirects to ~user translation
o  fix bugs around ~user translation
o  add schema detection for absolute redirects
o  fixed few memory leaks
o  bunch of minor tweaks
o  removed -r support
o  smarter redirects
--
Changes in 20150320:
o  fix redirection handling
o  support transport stream (.ts) and video object (.vob) files
o  directory listings show correct file sizes for large files
--
updates and bozohttpd 20160415:
o  add search-word support for CGI
o  fix a security issue in CGI suffix handler support which would
  allow remote code execution, from shm@netbsd.org
o  -C option supports now CGI scripts only

(snj)

1141

(snj)

Pull up following revision(s) (requested by mrg in ticket #1141):
libexec/httpd/CHANGES: up to 1.22
libexec/httpd/Makefile: up to 1.26
libexec/httpd/auth-bozo.c: up to 1.18
libexec/httpd/bozohttpd.8: up to 1.59
libexec/httpd/bozohttpd.c: up to 1.80
libexec/httpd/bozohttpd.h: up to 1.45
libexec/httpd/cgi-bozo.c: up to 1.33
libexec/httpd/content-bozo.c: up to 1.13
libexec/httpd/daemon-bozo.c: up to 1.17
libexec/httpd/dir-index-bozo.c: up to 1.25
libexec/httpd/lua-bozo.c: up to 1.14
libexec/httpd/lua/bozo.lua: up to 1.2
libexec/httpd/lua/glue.c: up to 1.2
libexec/httpd/main.c: up to 1.13
libexec/httpd/printenv.lua: up to 1.3
libexec/httpd/ssl-bozo.c: up to 1.22
libexec/httpd/testsuite/Makefile: up to 1.5
libexec/httpd/testsuite/test-bigfile: up to 1.2
libexec/httpd/tilde-luzah-bozo.c: up to 1.14
Import bozohttpd 20151028:
o  add CGI support for ~user translation (-E switch)
o  add redirects to ~user translation
o  fix bugs around ~user translation
o  add schema detection for absolute redirects
o  fixed few memory leaks
o  bunch of minor tweaks
o  removed -r support
o  smarter redirects
Changes in 20150320:
o  fix redirection handling
o  support transport stream (.ts) and video object (.vob) files
o  directory listings show correct file sizes for large files
--
updates and bozohttpd 20160415:
o  add search-word support for CGI
o  fix a security issue in CGI suffix handler support which would
  allow remote code execution, from shm@netbsd.org
o  -C option supports now CGI scripts only

(snj)

updates and bozohttpd 20160415:
o  add search-word support for CGI
o  fix a security issue in CGI suffix handler support which would
  allow remote code execution, from shm@netbsd.org
o  -C option supports now CGI scripts only

(mrg)

Tweak wording.  Use \(em for emdash.

(riastradh)

tickets 1142, 1145, 1156, 1157, 1158

(snj)

Pull up following revision(s) (requested by riastradh in ticket #1158):
xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c: revision 1.2
xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c: revision 1.2
xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp: revision 1.2
xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c: revision 1.5
Replace atexit() calls by destructor attributes - this shared library
is dlopen/dlclose'd !

(snj)

Pull up following revision(s) (requested by riastradh in ticket #1157):
sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_subdev.c: revision 1.3
sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c: revisions 1.9, 1.10
sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/namedb.h: revision 1.2
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar/nouveau_subdev_bar_base.c: revisions 1.4, 1.5
sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nouveau_subdev_instmem_nv40.c: revision 1.3
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c: revision 1.8
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h: revision 1.4
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c: revision 1.4
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c: revision 1.3
sys/external/bsd/drm2/include/linux/delay.h: revision 1.4
sys/external/bsd/drm2/include/linux/spinlock.h: revision 1.7
sys/external/bsd/drm2/nouveau/files.nouveau: revision 1.14
sys/external/bsd/drm2/nouveau/nouveau_pci.c: revision 1.7
Set nouveau to a more reasonable debug level.
Match the compile-time and default run-time settings in Linux.
--
Pass a sensible device state pointer to nouveau suspend/resume ops.
Gives nouveau half a chance of suspending and resuming -- not that it
works on my test laptop yet, but it's a start.
--
Fix bus_space_subregion error branch.
Return error code, not 0 (!), on bus_space_subregion failure.
In answer to `XXX error branch' comment: if nouveau_barobj_ctor
fails, then the caller will call nouveau_barobj_dtor too.  So there's
no leak here.
Unlikely to fix any observed bugs with nouveau -- there's no error
branch in the Linux side here.  But maybe it will catch some other
bug earlier.
--
Map the same mmio size as Linux does.
Unlikely to have practical consequences -- just reduces differences
in behaviour from upstream, to rule them out.
--
Print error code for failure to map PRAMIN BAR.
--
In msleep use mdelay if cold
--
Use only the low 32 bits of the bar object's vma offset as intended.
Should fix PR kern/50372, seen by everyone trying to use nouveau on
amd64 with hardware that uses nv50-style BARs and not nvc0-style
BARs.
--
Destroy the lock before caller frees memory.
--
Destroy spin locks appropriately.
--
Destroy the mutex before free.
--
Provide reader/writer semantics with recursive readers.
--
Exclude VRAM and FIFO regions from MMIO register mapping.
Nouveau maps those separately, and it is not trivial to convert those
mappings to bus_space_subregion.

(snj)

Pull up following revision(s) (requested by riastradh in ticket #1156):
sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: revision 1.9
Cast uint8_t to uint32_t before shifting left by 24.
Otherwise this is undefined behaviour unless int is 32-bit and the
uint8_t value happens to be <=127.

(snj)

Pull up following revision(s) (requested by phx in ticket #1145):
crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c: revision 1.26
crypto/dist/ipsec-tools/src/racoon/isakmp.c: revision 1.75
crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c: revision 1.28
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c: revision 1.14
PR/50918: David Binderman: Fix memory leak
--
From Frank Wille:
Request "IKE mode config" in "rsasig" (certificates on both sides only)
authentication mode, if "mode_cfg" is configured to "on".
Tested with a Lancom router, using the following configuration:
path include "/etc/racoon";
path certificate "/etc/racoon/certs";
path script "/etc/racoon/scripts";
remote "wpsd"
{
    remote_address 1.2.3.4;
    exchange_mode main,base;
    my_identifier asn1dn;
    certificate_type x509 "vpnclient15.crt" "vpnclient15.key";
    ca_type x509 "ca.crt";
    mode_cfg on;
    dpd_delay 20;
    nat_traversal on;
    lifetime time 8 hour;
    script "phase1-up.sh" phase1_up;
    script "phase1-down.sh" phase1_down;
    proposal {
        encryption_algorithm aes;
        hash_algorithm md5;
        authentication_method rsasig;
        dh_group 2;
    }
    proposal_check obey;
}
sainfo anonymous
{
    pfs_group 2;
    lifetime time 8 hour;
    encryption_algorithm aes;
    authentication_algorithm hmac_md5;
    compression_algorithm deflate;
}

(snj)

Pull up following revision(s) (requested by christos in ticket #1142):
usr.sbin/makemandb/apropos-utils.c: revisions 1.18, 1.19
CID 1341551: Don't bother formatting if ti == NULL
--
PR/50344: Stephen Fisher: apropos shows formatting on console with vt100 term
type. Can't print terminfo sequences directly; need to process them with
ti_puts() to handle padding. This removes the padding delays, and stricly
could break on slow terminal hardware, but they way the code is structured
makes it impossible to fix properly (since the formatting strings are
passed in the query).

(snj)

Add a new test case for PPPoE using PAP

From s-yamaguchi@IIJ (with some tweaks by me)

(ozaki-r)

Rump-ify if_pppoe

From s-yamaguchi@IIJ

(ozaki-r)

Hide PPPoE variables from if_ethersubr.c

This improves modularity of if_pppoe.

From s-yamaguchi@IIJ

(ozaki-r)

add lneto

(salazar)

Remove duplicated __RCSIDs I added years ago - I blame CVS.

Spotted by Miod Vallat

(skrll)

Remove stray debug printf().

(rjs)

If PAM is configured to read user-specified environment variables
and UseLogin=yes in sshd_config, then a hostile local user may
attack /bin/login via LD_PRELOAD or similar environment variables
set via PAM.

CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
https://anongit.mindrot.org/openssh.git/commit/?\
id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755

XXX: pullup-7

(christos)

missing ,

(christos)

- match endianness logic more to the original code
- fix namlen type
- use bool more
- eat \n's from panic strings

(christos)

add HAVE_MKSTEMP

(christos)