200766 Commits

Author SHA1 Message Date
bdrewery
3d4b7b45ca MFC r291081:
Rename checked-in 'includes' to 'includes.sh' to avoid colliding with
  share/mk target 'make includes'.
2015-12-04 18:39:57 +00:00
bdrewery
cede455917 MFC r290812:
Avoid setting schg in the objtree for lib32 build.
2015-12-04 18:33:32 +00:00
bdrewery
a749338c26 MFC r290435:
Don't allow environment-set options to bleed into src.conf.5 generation.
2015-12-04 18:32:39 +00:00
bdrewery
2ffafbd8c7 MFC r290431:
Add SUBDIR_PARALLEL.
2015-12-04 18:31:19 +00:00
bdrewery
ba57be3547 MFC r290170:
Remove unneeded NULL as this is initialized with M_ZERO.
2015-12-04 18:25:55 +00:00
bdrewery
42fd244b0b MFC r290169:
Use memmove(3) to avoid overlapping copy.
2015-12-04 18:24:47 +00:00
bdrewery
d54c7d5fdf MFC r290374:
Remove unneeded mutex.h include, missed in r287155.
2015-12-04 18:23:34 +00:00
bdrewery
ca2c0718a7 MFC r290084:
Remove unneeded NAME override.
2015-12-04 18:22:31 +00:00
bdrewery
21a7306566 MFC r290083:
Use more appropriate ${SHAREDIR} rather than /usr/share.
2015-12-04 18:21:05 +00:00
bdrewery
2dfe4da949 MFC r289393:
Add more SUBDIR_PARALLEL.
2015-12-04 18:14:31 +00:00
bdrewery
327f92037d MFC r289669:
Fix building in a directory with SUBDIRs and SUBDIR_PARALLEL.
2015-12-04 18:09:51 +00:00
bdrewery
40749e0509 MFC r289289,r290181:
r289289:
    Fix support for building a PROG_CXX, and PROG, directly.
  r290181:
    Unbreak bsd.progs.mk with PROGS (but not PROGS_CXX) and when invoking the
    "one of many" targets, e.g. `make hello_world`, where hello_world is a C
    program
2015-12-04 18:07:44 +00:00
bdrewery
eae1434b51 MFC r289286,r291338,r291340:
r289286:
    Follow-up r288218 by ensuring common objects are built before recursing.
  r291338:
    Fix the "common object" handling to not depend on ".o" if SRCS only
    contains headers.
  r291340:
    Follow-up r291338 to handle .d, .y and .l files better as well.
2015-12-04 18:06:47 +00:00
bdrewery
241e144b76 MFC r289872:
Replace gcc reference with 'cc' and document the default ${CC}.
2015-12-04 18:04:56 +00:00
bdrewery
d296342cfb MFC r289870,r289871:
r289870:
    Add bsd.crunchgen.mk to bsd.README.
  r289871:
    Sort properly.
2015-12-04 18:04:09 +00:00
bdrewery
16aebaeaea MFC r289736:
Document that we use {} for variable expansion.
2015-12-04 18:01:11 +00:00
bdrewery
16f32e49cb MFC r289379:
Remove directories disconnected since r169718.
2015-12-04 17:59:45 +00:00
bdrewery
ed825ef326 MFC r289375:
Fix wrong use of .for; the iteration variable is not used in the loop.
2015-12-04 17:58:31 +00:00
bdrewery
74816b797c MFC r289374:
Remove excess .else
2015-12-04 17:57:36 +00:00
bdrewery
28f8b6600d MFC r289360,r289361,r289378,r289430,r289605,r289676:
r289360:
    Add temporary workaround for .MAKE being applied to _worldtmp, since
    r251750.
  r289361:
    Consider top-level targets to be .PHONY as bmake won't build them otherwise
    if a file with the same name is found in the directory.
  r289378:
    Mark sub-make targets as .MAKE and .PHONY to handle -n and always-build
    properly.
  r289430:
    Remove .MAKE from targets that do more than just run sub-makes, such as
    calling rm or mtree.
  r289605:
    Add missing .PHONY for parallel subdir target.
  r289676:
    Add some missing '+', .MAKE, and .PHONY modifiers.
2015-12-04 17:56:10 +00:00
bdrewery
1c5b4d7b40 MFC r284105,r284106,r284163:
r284105:
    Cleanup some indentation issues.
  r284106:
    Implement '-s' to copy as symlink, similar to the current -l link(2)
    handling.
  r284163:
    Cleanup some style(9) issues.

Relnotes:	yes
2015-12-04 17:36:35 +00:00
bdrewery
b490558ee6 MFC r291001:
ipfw: Fix dynamic IPv6 rules showing junk for non-specified address masks.

Relnotes:	yes
2015-12-04 17:33:33 +00:00
des
72c7e45913 MFH (r287917, r287918, r289063): upgrade to latest Unbound
MFH (r283301, r289592, r291582): rc script improvements
MFH (r287880): respect manually configured forwarders when using DHCP
MFH (r289321): deconfuse man page

PR:		184047 203580 204931
2015-12-04 13:26:12 +00:00
ngie
fc230dcf44 MFC r290913,r291181:
r290913:

Port contrib/netbsd-tests/kernel/t_mqueue.c to FreeBSD

- Add missing headers
- Ensure mqueuefs is loaded
- Make sure the mqueuefs path is absolute and relative to /
- Cast the result of mq_open returning -1 to (mqd_t) to mute a compiler
  warning

Sponsored by: EMC / Isilon Storage Division

r291181:

Integrate contrib/netbsd-tests/kernel/t_mqueue into the FreeBSD test
suite as tests/sys/kern/mqueue_test
2015-12-04 09:32:03 +00:00
ngie
634df7f08c MFC r291180:
Fix up convert.c generation

- Use a temporary file for convert.c to reduce likelihood of an interrupted
  build resulting in bad code being written to convert.c
- Truncate the file instead of appending to it to ensure that the file being
  touched will not result in duplicate declarations/definitions from
  kern_acct.c if/when kern_acct.c changes.
2015-12-04 09:29:47 +00:00
ngie
6091b94628 MFC r291359,r291362:
r291359:

Skip over lines that start with # (comments)

r291362:

r291359 was incorrect. Skip over tokens that start with `#' as fgetln can
return more than one '\n' delimited line in a buffer

Handle empty lines too, just in case
2015-12-04 09:25:13 +00:00
ngie
a0e8b14feb MFC r291363:
Clean up trailing whitespace
2015-12-04 09:18:12 +00:00
ngie
8f93b93db6 MFC r291358:
Remove cnftp.bjpu.edu.cn (it no longer resolves)
Add localhost to resolv/mach for parity with nss/mach
2015-12-04 09:10:49 +00:00
kib
fb0b76eb8f MFC r291379:
Move the comment about resident pages preventing vnode from leaving
active list, into the header comment for vdrop().
2015-12-04 09:09:19 +00:00
ngie
e6a699bf60 MFC r284527,r284528,r284608,r285219,r291166,r291167:
r284527 (by imp):

Update style.9 to reflect consensus on developer's mailing list
allowing redundant braces.

Differential Revision: https://reviews.freebsd.org/D2842

r284528 (by imp):

Bump date.

Submitted by: Xin Li

r284608 (by imp):

Back out contested change until dispute is resolved. This proved to be
more contentious than I expected.

r285219 (by imp):

The results of the vote are in. This reflects that vote. Single
line statements inside of braces is recognized as an acceptable
style.
	http://reviews.freebsd.org/V3
As always, this isn't license for wholesale change, etc.

r291166:

Recommend cc -Wall instead of gcc -Wall

r291167:

Bump .Dd
2015-12-04 09:07:18 +00:00
jkim
fdc1215ebe Merge OpenSSL 1.0.1q. 2015-12-03 21:18:48 +00:00
rodrigc
68a4f44cfa Fix bad MFC (r291173)
Replace SRCTOP with the relevant path via .CURDIR

Reviewed by: bdrewery
2015-12-03 18:04:43 +00:00
royger
e9bddfef0b MFC r291024:
xen: fix dropping bitmap IPIs during resume

Sponsored by:		Citrix Systems R&D
2015-12-03 11:05:35 +00:00
rmacklem
68e44b1d70 MFC: r291035
The problem report was for a crash that happened when smbfs was
trying to do a mount. Given the backtrace,
it appears that the crash occurred when smb_vc_create() failed and then
called smb_vc_put() with vcp->vc_iod == NULL. smb_vc_put() subsequently
called smb_vc_disconnect() with vcp->vc_iod == NULL, causing the crash.
This patch adds a check for vcp->vc_iod != NULL in smb_vc_disconnect() to
avoid the crash. It also fixes the case in smb_vc_create() where
kproc_create() fails so that it destroys the mutexes and sets
vcp->vc_iod == NULL before free()'ing the iod structure.
2015-12-02 21:48:34 +00:00
fabient
ccce6feaa4 MFC r291301:
The r241129 description was wrong that the scenario is possible
 only for read locks on pcbs. The same race can happen with write
 lock semantics as well.

 The race scenario:

 - Two threads (1 and 2) locate pcb with writer semantics (INPLOOKUP_WLOCKPCB)
  and do in_pcbref() on it.
 - 1 and 2 both drop the inp hash lock.
 - Another thread (3) grabs the inp hash lock. Then it runs in_pcbfree(),
  which wlocks the pcb. They must happen faster than 1 or 2 come INP_WLOCK()!
 - 1 and 2 congest in INP_WLOCK().
 - 3 does in_pcbremlists(), drops hash lock, and runs in_pcbrele_wlocked(),
  which doesn't free the pcb due to two references on it.
  Then it unlocks the pcb.
 - 1 (or 2) gets wlock on the pcb, runs in_pcbrele_wlocked(), which doesn't
  report inp as freed, due to 2 (or 1) still helding extra reference on it.
  The thread tries to do smth with a disconnected pcb and crashes.

 Submitted by:	emeric.poupon@stormshield.eu
 Reviewed by:	glebius@
 Sponsored by: Stormshield
 Tested by: Cassiano Peixoto, Stormshield
2015-12-02 17:26:37 +00:00
royger
904bdb8bc2 Revert MFC of r291023:
Due to the delta between HEAD and stable/10 event channel code, this fix is
not needed on stable/10 and was also causing build issues. Revert it.
2015-12-02 12:58:20 +00:00
royger
b1833e1562 MFC r291023:
xen/intr: properly dispose event channels on resume

Sponsored by:		Citrix Systems R&D
2015-12-02 10:26:34 +00:00
royger
28836b5874 MFC r291022:
x86/intr: allow mutex recursion in intr_remove_handler

Sponsored by:		Citrix Systems R&D
2015-12-02 10:23:54 +00:00
ngie
90fda359a4 MFC r269902,r270101:
r269902:

Convert bin/sh/tests to ATF

The new code uses a "test discovery mechanism" to determine
what tests are available for execution

The test shell can be specified via:

  kyua test -v test_suites.FreeBSD.bin.sh.test_shell=/path/to/test/sh

Sponsored by: EMC / Isilon Storage Division
Approved by: jmmv (mentor)
Reviewed by: jilles (maintainer)

r270101 (by jilles):

sh: Don't hardcode relative paths in the tests stderr files.

These paths have had to be adjusted to changes in the testsuite runner
several times, so modify the tests to remove the need for such adjustment.

A cp in functional_test.sh is now unneeded, but this matters little in
performance.
2015-12-01 18:27:38 +00:00
ngie
394e9d5dd4 MFC r285118:
r285118 (by jmmv):

Add missing shebang

Plain test programs are not preprocessed by the build system (as opposed to
ATF test cases, which automatically gain a shebang pointing at atf-sh), so
we must take care of providing the shebang ourselves.

I'm not sure why this was not causing problems with Kyua 0.11, but the
upcoming 0.12 release chokes on this particular issue.
2015-12-01 18:21:25 +00:00
ngie
f2f170ddd8 MFC r285140:
r285140 (by oshogbo):

Add fdclose(3) function.

This function is equivalent to fclose(3) function except that it
does not close the underlying file descriptor.
fdclose(3) is step forward to make FILE structure private.

Reviewed by:	wblock, jilles, jhb, pjd
Approved by:	pjd (mentor)
Differential Revision:	https://reviews.freebsd.org/D2697
2015-12-01 18:19:23 +00:00
ngie
ff68307fb4 MFC r278932:
r278932 (by pfg):

libc: clean some set-but-not-used errors.

These were found by gcc 5.0 on Dragonfly BSD, however I
made no attempt to silence the false positives.

Obtained from:	DragonFly (cf515c3a6f3a8964ad592e524442bc628f8ed63b)
2015-12-01 07:32:35 +00:00
ngie
194e32cbb7 MFC r269326:
r269326 (by n_hibma):

Fix the example: free the memory that was allocated by getline().
2015-12-01 07:16:05 +00:00
rmacklem
f72e7ffb57 MFC: r290970
mnt_stat.f_iosize (which is used to set bo_bsize) must be set to
the largest size of buffer cache block or the mapping of the buffer
is bogus. When a mount with rsize=4096,wsize=4096 was done, f_iosize
would be set to 4096. This resulted in corrupted directory data, since
the buffer cache block size for directories is NFS_DIRBLKSIZ (8192).
This patch fixes the code so that it always sets f_iosize to at least
NFS_DIRBLKSIZ.
2015-12-01 02:30:41 +00:00
smh
ee4f717293 MFC r291004:
Fix early kernel dump via dumpdev env

Sponsored by:	Multiplay
2015-12-01 00:53:03 +00:00
smh
acd245f48b MFC r288153:
Use kenv 'dumpdev' in the same way as etc/rc.d/dumpon

Sponsored by:	Multiplay
2015-12-01 00:48:31 +00:00
mav
8cd0a777b2 MFC r291143: Update Qlogic 23XX firmware from 3.03.26 to 3.03.28 2015-11-30 23:00:22 +00:00
mav
096c78a938 MFC r291132: Update firmware for QLogic 22xx from 2.02.06 to 2.02.08. 2015-11-30 22:59:32 +00:00
mav
7ea9902b0d MFC r289755: Remove residual verbosity.
firmware_register() already reports errors.
2015-11-30 22:58:48 +00:00
mav
9718915814 MFC r291365, r291369: One more round of port scanner rewrite.
- Make scan aborted by event restart immediately and infinitely.
 - Improve handling of some loop events from firmware.
 - Remove loop down timer, adding its functionality to scanner thread.
 - Some more unification and simplification.
2015-11-30 21:58:51 +00:00