194080 Commits

Author SHA1 Message Date
glebius
2f2c733b13 Merge r258122 from head:
Emphasize that pf(4) in FreeBSD doesn't match pf(4) in
  OpenBSD 4.5, but is derived from it, and got some
  important local changes.

Approved by:	re (kib)
2013-11-22 19:26:52 +00:00
glebius
70fbcb845d Merge r256769 by des from head:
Last few remnants of BIND (hopefully...)

Approved by:	re (kib)
2013-11-22 19:26:04 +00:00
tijl
e02340b360 MFC r258318:
Also delete lib32 libiconv.

Reported by:	Tomoaki AOKI <junchoon@dec.sakura.ne.jp>

MFC r258345:

One more BIND remnant: /etc/mtree/BIND.chroot.dist

Discussed with:	des

Approved by:	re (kib)
2013-11-22 12:51:55 +00:00
davidcs
829067b445 MFC r258155
ql_hw.[c,h]: set minimum thresholds on pkt size for lro path.
ql_ioctl.c: validate the length and address of buffer passed to QL_RD_FW_DUMP
MFC r258156
qls_ioctl.c: Validate the buffer and its length passed to QLA_MPI_DUMP.
             copyout dump only if qls_mpi_core_dump() is successful.
(like to credit x90c for pointing the issue)

Approved by: re (delphij)
2013-11-22 00:26:21 +00:00
tuexen
877516e51a MFC r256556:
Remove a buggy comparision when setting manually the path MTU.
After fixing, the comparision would have become redundant.
Thanks to Andrew Galante for reporting the issue.

MFC r257272:
Fix compilation if SCTP_DONT_DO_PRIVADDR_SCOPE is defined.
The issue was reported by Andrew Galante.

MFC r257274:
Fix the value of *optlen when calling getsockopt() for
SCTP_REMOTE_UDP_ENCAPS_PORT.
This issue was reported by Andrew Galante.

MFC r257359:
Terminate a debug output with a \n.

MFC r257555:
Changes from upstream to improve compilation when INET or INET6
or none of them is defined.

MFC r257574:
Unlock the lock before destroying it.
This issue was reported by Andrew Galante.

MFC r257800:
Use htons()/ntohs() appropriately.
These issues were reported by Andrew Galante.

MFC r257803:
Make sure that we don't try to build an ASCONF-ACK chunk
larger than what fits in the the mbuf cluster.
This issue was reported by Andrew Galante.

MFC r257804:
Get rid of the artification limitation enforced by
SCTP_AUTH_RANDOM_SIZE_MAX.
This was suggested by Andrew Galante.

MFC r258221:
Cleanups which result in fixes which have been made upstream
and where partially suggested by Andrew Galante.
There is no functional change in FreeBSD.

MFC r258224:
When determining if an address belongs to an stcb, take the address family
into account for wildcard bound endpoints.

MFC r258228:
Remove a stray write operation.

MFC r258235:
Use SCTP_PR_SCTP_TTL when the user provides a positive
timetolive in sctp_sendmsg().

Approved by: re@
2013-11-21 23:00:09 +00:00
dteske
d0873bf093 MFC Revisions:
256549: man-page updates
256551: .Dd bump in manpage
256553: bootenv -> ROOT fix
257842: monster list of fixes
257843: minor touchup
257844: copy install log
257845: fixup to last
257872: mdoc fixup
257939: debug check
258021: MBR bootcode fixup

Reviewed by:	many
Discussed on:	-current
Approved by:	re (hrs)
2013-11-21 03:40:52 +00:00
dteske
7f36b7bf08 MFC r257755-257756,257780-257785,257787-257793, and
257795,257817,257819,257937-257938,258029,258263-258267:
257755: SRV records
257756: fix spurious error message
257780: Whitespace
257781: Comments and funny syntax
257782: Debug file truncation is optional
257783: f_show_err for debugging
257784: f_eval_catch for debugging
257785: fix size calculations bug
257787: fix broken HTTP "any" media type
257788: more debugging
257789: Comments
257790: fix printf usage bug
257791: f_[v]sprintf added
257792: Comments
257793: fix off-by-one error in size calcs
257795: Replace pkg-tools with pkgng
257817: fix cosmetic typos
257819: Use `pkg -vv' to get ABI
257937: Adjustment to last
257938: Adjustment to last
258029: Comments
258263: Shuffle code around
258264: Remove unused code
258265: Debugging. Use f_eval_catch with pkg
258266: Shutdown media on exit from packages
258267: Fix pkg install from DVD

Reviewed by:	many
Discussed on:	-current
Approved by:	re (hrs)
2013-11-21 03:38:47 +00:00
gjb
a2ed0ef7f6 MFC r258305, r258307, r258308, r258309, r258310, r258314, r258317,
r258319, r258320:

r258305:
  Use the IMAGES variable to determine which image files to remove
  as part of 'make -C /usr/src/release clean'.

r258307:
  Add a script and configuration files to fetch pre-built packages
  from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).

r258308:
  Unconditionally copy the build host /etc/resolv.conf into
  the chroot directory, since hostname resolution may be
  needed in the case of building a dvd image (with packages)
  and also setting 'NOPORTS=1'.

r258309:
  Set the PKG_CACHEDIR directory to 'dvd/' instead of 'release/'
  in preparation of adding a 'dvd1.iso' target.

r258310:
  Add the 'dvd1.iso' target.  This mimics the 'release.iso' target,
  with the additional step of fetching packages for inclusion on the
  dvd image.

  The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if
  the '${TARGET}/pkg-stage.conf' configuration file exists (currently
  only amd64 and i386).

  Allow dvd1.iso to be skipped if NODVD=1.

r258314:
  Fix how ABI is evaluated so it matches more than a dot-zero
  case.

r258317:
  Document the 'dvdrom' target.

r258319:
  Remove WITHOUT_PROFILE=1 for the dvd1.iso medium.

r258320:
  Simplify PKG_ABI for pkg-stage.sh.

Approved by:	re (hrs)
Sponsored by:	The FreeBSD Foundation
2013-11-21 02:45:36 +00:00
peter
f3237abb84 MFC r258283 - move iconv* symbols out of libc.so.7 namespace with
compatibility symbols to aid transition for existing 10.x installs.

Approved by:	re (kib)
2013-11-20 20:24:59 +00:00
peter
f6e0c2efdf MFC r258254 - teach iconv about a WCHAR_T pseudo-type
Approved by:	re (kib)
2013-11-20 18:58:07 +00:00
peter
f7d1d154d9 MFC r256557: add uname flags to access userland's __FreeBSD_version more
conveniently than the traditional way of scripts parsing #include files.

Approved by:	re (hrs)
2013-11-20 17:46:23 +00:00
oleg
ebf69b45ac MFC: 257695
- Fix link loss on vlan reconfiguration.
- Fix issues with 'vlanhwfilter'.

Approved by:	re (glebius)
2013-11-19 14:24:25 +00:00
des
beb38c6e85 MFH (r257954): upgrade to OpenSSH 6.4p1
Approved by:	re (kib)
2013-11-19 11:47:30 +00:00
pluknet
6fcdc56ba5 MFC r257874:
Fix extattr(2) MLINKS.

Approved by:	re (kib)
2013-11-19 10:39:48 +00:00
des
1dfe9ec22a Pre-zero the MAC context.
Security:	CVE-2013-4548
Security:	FreeBSD-SA-13:14.openssh
Approved by:	re (implicit)
2013-11-19 09:35:20 +00:00
pjd
d0736de43b MFC r258148,r258149,r258150,r258152,r258153,r258154,r258181,r258182:
r258148:

Add a note that this file is compiled as part of the kernel and libc.

Requested by:	kib

r258149:

Change cap_rights_merge(3) and cap_rights_remove(3) to return pointer
to the destination cap_rights_t structure.

This already matches manual page.

r258150:

Sync return value with actual implementation.

r258151:

Style.

r258152:

Precisely document capability rights here too (they are already documented
in rights(4)).

r258153:

The CAP_LINKAT, CAP_MKDIRAT, CAP_MKFIFOAT, CAP_MKNODAT, CAP_RENAMEAT,
CAP_SYMLINKAT and CAP_UNLINKAT capability rights make no sense without
the CAP_LOOKUP right, so include this rights.

r258154:

- Move CAP_EXTATTR_* and CAP_ACL_* rights to index 1 to have more room
  in index 0 for the future.
- Move CAP_BINDAT and CAP_CONNECTAT rights to index 0 so we can include
  CAP_LOOKUP right in them.
- Shuffle the bits around so there are no gaps. This is last chance to do
  that as all moved rights are not used yet.

r258181:

Replace CAP_POLL_EVENT and CAP_POST_EVENT capability rights (which I had
a very hard time to fully understand) with much more intuitive rights:

	CAP_EVENT - when set on descriptor, the descriptor can be monitored
		with syscalls like select(2), poll(2), kevent(2).

	CAP_KQUEUE_EVENT - When set on a kqueue descriptor, the kevent(2)
		syscall can be called on this kqueue to with the eventlist
		argument set to non-NULL value; in other words the given
		kqueue descriptor can be used to monitor other descriptors.
	CAP_KQUEUE_CHANGE - When set on a kqueue descriptor, the kevent(2)
		syscall can be called on this kqueue to with the changelist
		argument set to non-NULL value; in other words it allows to
		modify events monitored with the given kqueue descriptor.

Add alias CAP_KQUEUE, which allows for both CAP_KQUEUE_EVENT and
CAP_KQUEUE_CHANGE.

Add backward compatibility define CAP_POLL_EVENT which is equal to CAP_EVENT.

r258182:

Correct right names.

Sponsored by:	The FreeBSD Foundation
Approved by:	re (kib)
2013-11-18 22:37:01 +00:00
dim
fe09c80878 MFC r258016:
Disable building the ctl module for the i386 XEN kernel configuration
for now, since it causes gcc warnings about casting 64 bit bus_addr_t's
to 32 bit pointers, and vice versa.

Reviewed by:	ken
Approved by:	re (gjb)
2013-11-18 15:13:58 +00:00
hrs
ae913ced24 MFC 257636:
Fix EUC ESDB and JIS CS-mapper.

Approved by:	re (delphij)
2013-11-18 04:42:58 +00:00
alfred
a5f87707e1 MFC: 258276
Fix creating a vlan over lagg over mlxen crash.

PR:             181931
Submitted by:   Shahar Klein (shahark mellanox.com)

Approved by:	re
2013-11-17 22:24:34 +00:00
gjb
6863a0ee58 MFC r258101:
Since the doc/ toolchain conversion to docbook 5.0, JADETEX
  is no longer a valid option, so remove 'WITHOUT_JADETEX=yes'
  from PBUILD_FLAGS.

  While here, also remove 'WITHOUT_X11=yes', since it will
  cause a dependency conflict by requiring both print/ghostscript9
  and print/ghostscript9-nox11.

  Switch to OPTIONSNG format (WITHOUT_* -> OPTIONS_UNSET='FOO'),
  and unset the FOP option, which requires Java (although it is
  disabled by default).  Also unset the 'IGOR' option, since
  textproc/igor is a validation tool, not necessarily a dependency
  of the doc/ build itself.

  While here, reduce the line length of PBUILD_FLAGS.

Approved by:	re (kib)

Sponsored by:	The FreeBSD Foundation
2013-11-17 15:58:13 +00:00
alfred
484bf089ba MFC: 257542
Fix API mismatch exposed by lagg.

When destroying a lagg the driver tries to restore the old mac and
fails due to API mismatch.

Submitted by:   Shahar Klein (shahark at mellanox.com)
Approved by:     re
2013-11-17 01:07:46 +00:00
gjb
cc8b081ade MFC r257999 (peter):
Merge nvi-2.1.1 -> 2.1.2

Approved by:	re (???)

Sponsored by:	The FreeBSD Foundation
2013-11-16 19:22:13 +00:00
gjb
8eaba28048 MFC r257583, r258012, r258013:
r257583 (peter):
 Remove the WITH_LIBICONV_COMPAT hack that seems to do more harm
 than good.  This caused libc to spoof the ports libiconv namespace
 and provide a colliding libiconv.so.3 to fool rtld.  This should
 have been removed some time ago.

 r258012:
 Remove WITH_LIBICONV_COMPAT file to chase after r257583.

 r258013:
 Regenerate src.conf.5 after removal of WITH_LIBICONV_COMPAT.

Approved by:	re (kib)
Sponsored by:	The FreeBSD Foundation

Sponsored by:	The FreeBSD Foundation
2013-11-16 18:40:44 +00:00
jmg
d64a925559 MFC r257757:
fix issues w/ AES-NI on unaligned data blocks...

Approved by:	re (kib)
2013-11-16 09:01:24 +00:00
edavis
5683b3641f Merge r258187 from head.
Approved by:	re@ (delphij)
Approved by:	davidch (mentor)
2013-11-16 00:31:32 +00:00
kib
5b26108b2e MFC r257856:
Add bits for the AMD features from CPUID function 0x80000001 ECX,
described in the rev. 3.0 of the Kabini BKDG, document 48751.pdf.

Approved by:	re (gjb)
2013-11-15 07:10:42 +00:00
kib
bc035b6554 MFC r257858:
Fix signal delivery for the iBCS2 binaries.

Approved by:	re (gjb)
2013-11-15 07:09:24 +00:00
trasz
ead14302e7 MFC r257917:
Fix typo in "iscsictl -v".

Approved by:	re (gjb)
Sponsored by:	The FreeBSD Foundation
2013-11-14 13:33:22 +00:00
trasz
77d8ffb510 Fix typo.
Approved by:	re (gjb)
Sponsored by:	The FreeBSD Foundation
2013-11-14 12:14:27 +00:00
pluknet
a5c87067b8 Merge r257996,r258001,r258069 from head: fixes for HyperV guest.
- Set description string for VM_GUEST_HV (HyperV guest).
- Add a brief comment about VM_GUEST and vm_guest_sysctl_names relationship.
- CTASSERT that vm_guest range is covered by vm_guest_sysctl_names.

Approved by:	re (glebius)
2013-11-14 09:33:54 +00:00
glebius
0daddca6bd Merge r257945 from head:
Do not use just freed memory.

Approved by:	re (kib)
2013-11-14 09:26:52 +00:00
glebius
bb108535ba Merge r257888, r258049 from head:
- Use system libiconv, instead of trying to dlopen() it.
  - Just disable recoding support in libsmb if built WITHOUT_ICONV.

PR:		183153
Approved by:	re (kib)
2013-11-14 09:25:29 +00:00
glebius
6e9011bd59 Merge r257841 from head:
Catch up with sb_timeo type change in r255138. This fixes
  smbfs operation.

PR:		kern/182963
Approved by:	re (kib)
2013-11-14 09:19:50 +00:00
glebius
233591315f Merge r257694 from head:
Remove remnants of BIND from /etc, since there is no BIND in base now.

  Sorry, that would break users running head and BIND from ports, since
  ports rely on these scripts. The ports will be fixed soon.

Approved by:	re (kib)
2013-11-14 09:14:33 +00:00
glebius
fa658a0f72 Merge r257421 from head:
Provide a crutch that prevents watchdog to interrupt dumping
  on a box with IPMI enabled.

Approved by:	re (kib)
2013-11-14 09:11:54 +00:00
dumbbell
ef65f230b0 MFC r257870:
drm/radeon: Wake up userland after page flip

For instance, this caused issues in KDE, such as stuttered animations
(with desktop effects enabled).

Approved by:	re (kib)
2013-11-12 20:00:51 +00:00
dumbbell
6acdccef77 MFC r257869:
drm: Initialize "handle" to 0 before calling drm_gem_handle_create()

This is variable is being checked in drm_gem_name_create() before being
set.

Approved by:	re (delphij)
2013-11-12 19:10:28 +00:00
kib
faa83dc918 MFC r257680:
Do not coalesce if the swap object belongs to tmpfs vnode.

Approved by:	re (glebius)
2013-11-12 08:01:58 +00:00
dim
030879a51a MFC r257859:
Fix typo in include guard, found by clang 3.4.

Approved by:	re (hrs)
2013-11-11 20:57:04 +00:00
brueffer
46450a5014 MFC: r257287
New sentence -> new line and some mdoc cleanup.

Approved by:	re (glebius)
2013-11-11 14:08:25 +00:00
brueffer
add016b338 MFC: r257288
Clean up a spurious "." in SEE ALSO.

Approved by:	re (glebius)
2013-11-11 14:04:26 +00:00
ae
d14632ec0b MFC r257084:
Initialize inc_fibnum for properly handling ICMP6_PACKET_TOO_BIG
  errors in multifib environment.

  PR:		183265
Approved by:	re (hrs)
2013-11-11 10:43:39 +00:00
ae
95353ffa2c MFC r256689:
Use the same actor key for media types of the same speed.

  PR:		176097

MFC r256832:
  Add a note that lacp_compose_key() should be updated, when new media
  types will be added.

  Submitted by:	melifaro

Approved by:	re (hrs)
2013-11-11 09:47:51 +00:00
gjb
4f116e3822 MFC r257749:
Switch to using pkg(8) for the doc install in bsdinstall(8).
  This also bootstraps the system with pkg(8) for future use.

Approved by:	re (delphij)
PR:		183488
Sponsored by:	The FreeBSD Foundation
2013-11-09 00:59:31 +00:00
alfred
204a78e2fc MFC: r257862, r257863, r257864
r257862:

Use explicit long cast to avoid overflow in bitopts.

This was causing problems with the buddy allocator inside of
ofed.

r257863:

Fix for bad performance when mtu is increased.

Update the auto moderation behavior in the mlxen driver to match
the new LINUX OFED code.

r257864:

Do not use a sleep lock when protecting the driver flags.

This was causing a locking issue with lagg.

Approved by:	re
2013-11-08 22:29:07 +00:00
gjb
8964c3a79b MFC r257801 (gabor):
- Syncronize stable/10/release/doc with head/ in followup to
   the docbook5.0 update to the doc/ repository.

Approved by:	re (delphij)
Sponsored by:	The FreeBSD Foundation
2013-11-07 21:08:12 +00:00
bdrewery
c49734a56e MFC r257668:
Use proper capitalization for FreeBSD.org

Approved by:	bapt
Approved by:	re (gjb)
2013-11-07 15:43:41 +00:00
bdrewery
3e03c24778 MFC r257667:
Enable fingerprint checking as the currently known
  fingerprint has an uploaded signature on all mirrors.

Approved by:	bapt
Approved by:	re (gjb)
2013-11-07 11:21:08 +00:00
gjb
912a6a5027 MFC r257641:
When building the textproc/docproj port, the ports-mgmt/pkg port
 needs /var/run/ld-elf*.so.hints, which is not automatically created.

 Fix reldoc build by running the ldconfig(8) startup script in the
 chroot directory before starting the port build phase.

Approved by:	re (kib)
Sponsored by:	The FreeBSD Foundation
2013-11-07 04:13:27 +00:00
pjd
c0de708441 Merge r257633:
- Add manual pages for capability rights (rights(4)), cap_rights_init(3)
  family of functions and cap_rights_get(3) function.
- Update remaining Capsicum-related manual pages.

Sponsored by:	The FreeBSD Foundation
Reviewed by:	bdrewery
Approved by:	re (glebius)
2013-11-06 23:59:19 +00:00