3 years agoMerge branch 'vendor/OPENSSH'
Sascha Wildner [Tue, 24 Jul 2018 11:25:57 +0000 (13:25 +0200)]
Merge branch 'vendor/OPENSSH'

3 years agoClean up the OpenSSH vendor branch a tiny bit.
Sascha Wildner [Tue, 24 Jul 2018 10:43:52 +0000 (12:43 +0200)]
Clean up the OpenSSH vendor branch a tiny bit.

3 years agoopenpam: Sync OpenPAM modules a bit with FreeBSD.
Sascha Wildner [Tue, 24 Jul 2018 07:55:49 +0000 (09:55 +0200)]
openpam: Sync OpenPAM modules a bit with FreeBSD.

Not much to see here, except some bugfixes. Oh, and ed25519 support
in pam_ssh.

3 years agoRevert "mtree(8): Replace our mtree(8) with NetBSD's version."
Sascha Wildner [Mon, 23 Jul 2018 11:26:33 +0000 (13:26 +0200)]
Revert "mtree(8): Replace our mtree(8) with NetBSD's version."

This reverts commit 2f6d3139ecacca3533517516db002cf436f78918.

The upgrade breaks compilation of mtree on a release box during the
bootstrap-tools stage. I don't want to keep this broken until I've
found a good solution.

3 years agoboot/efi: Sync our TianoCore EDK II headers with the UDK2018 branch.
Sascha Wildner [Mon, 23 Jul 2018 11:00:23 +0000 (13:00 +0200)]
boot/efi: Sync our TianoCore EDK II headers with the UDK2018 branch.

3 years agodrm: Reduce drm_bufs.c differences with Linux 4.7.10
François Tigeot [Sun, 22 Jul 2018 20:37:13 +0000 (22:37 +0200)]
drm: Reduce drm_bufs.c differences with Linux 4.7.10

3 years agomtree(8): Replace our mtree(8) with NetBSD's version.
Sascha Wildner [Sun, 22 Jul 2018 14:57:40 +0000 (16:57 +0200)]
mtree(8): Replace our mtree(8) with NetBSD's version.

Some of its files will be used by other stuff we want to upgrade or
bring in, such as install(1) and makefs(8).

Since mtree(8) is a bootstrap tool and I want this to be painless,
I've imported some other source files that mtree(8) uses, such as
from mknod(1), which we don't have, as part of mtree(8).

3 years agokernel/ena: Hook the ena(4) driver into the build.
Sascha Wildner [Sun, 22 Jul 2018 13:32:49 +0000 (15:32 +0200)]
kernel/ena: Hook the ena(4) driver into the build.

3 years agokernel/ena: Port the ena(4) driver to DragonFly.
Brad Hoffman [Wed, 18 Jul 2018 14:41:03 +0000 (14:41 +0000)]
kernel/ena: Port the ena(4) driver to DragonFly.

This work is based on an initial (non-building) patch by swildner
and also contains work by dillon. Special thanks to Colin Percival
and sephe for their help and assistance.

The driver works but should still be considered experimental.

Useful dports are:


3 years agokernel: Bring in FreeBSD's ena(4) driver unchanged and unhooked.
Sascha Wildner [Wed, 18 Jul 2018 16:54:07 +0000 (18:54 +0200)]
kernel: Bring in FreeBSD's ena(4) driver unchanged and unhooked.

This is a driver for Amazon's Elastic Network Adapter family,
for EC2 instances that support it.

3 years agodrm: Sync a few bits with Linux 4.7.10
François Tigeot [Sat, 21 Jul 2018 16:20:06 +0000 (18:20 +0200)]
drm: Sync a few bits with Linux 4.7.10

3 years agodrm: dev->dma_lock doesn't exist
François Tigeot [Sat, 21 Jul 2018 16:02:58 +0000 (18:02 +0200)]
drm: dev->dma_lock doesn't exist

3 years agodrm/linux: add agp_backend.h
François Tigeot [Sat, 21 Jul 2018 15:01:58 +0000 (17:01 +0200)]
drm/linux: add agp_backend.h

3 years agokernel/icu: Fix a typo.
Sascha Wildner [Sat, 21 Jul 2018 11:35:07 +0000 (13:35 +0200)]
kernel/icu: Fix a typo.

3 years agosysctl_add_oid.9: Improve a bit.
Sascha Wildner [Sat, 21 Jul 2018 11:07:48 +0000 (13:07 +0200)]
sysctl_add_oid.9: Improve a bit.

Add missing .Nm and fix the arguments of 4 macros. Note that we can't
really have them as being of the type of the actual arg until we fix
a number of int to uintmax_t in the sysctl code itself.

3 years agovmstat: Add -o option to report objcache usage.
Sepherosa Ziehau [Sat, 21 Jul 2018 08:59:14 +0000 (16:59 +0800)]
vmstat: Add -o option to report objcache usage.

3 years agombuf: Reduce objcache name verbosity.
Sepherosa Ziehau [Sat, 21 Jul 2018 08:58:49 +0000 (16:58 +0800)]
mbuf: Reduce objcache name verbosity.

3 years agokernel: Port some remaining, yet unused, *_TRYLOCK() functions.
Sascha Wildner [Sat, 21 Jul 2018 08:50:11 +0000 (10:50 +0200)]
kernel: Port some remaining, yet unused, *_TRYLOCK() functions.

This is just for cleanup and obviously changes nothing.

3 years agokernel: Fix some wrong porting of *_TRYLOCK() macros.
Sascha Wildner [Sat, 21 Jul 2018 08:45:29 +0000 (10:45 +0200)]
kernel: Fix some wrong porting of *_TRYLOCK() macros.

Of these three, only CHN_TRYLOCK() is used in actual, active code,
but it is in the SNDCTL_DSP_SYNCSTART ioctl which in turn is not
used in base or in dports.

ARCMSR_LOCK_TRY() and PCM_TRYLOCK() are not used at all.

3 years agokernel/drm: Use more straightforward lockmgr_try().
Sascha Wildner [Sat, 21 Jul 2018 08:36:36 +0000 (10:36 +0200)]
kernel/drm: Use more straightforward lockmgr_try().

3 years agokernel/lockmgr: Add lockmgr_try().
Sascha Wildner [Sat, 21 Jul 2018 08:28:17 +0000 (10:28 +0200)]
kernel/lockmgr: Add lockmgr_try().

It just adds LK_NOWAIT to the flags and returns whether the
lock was obtained.

It is similar to other functions such as spin_trylock() or
FreeBSD's mtx_trylock() and can be used to port the latter.

Note that like these functions, it returns TRUE if successful,
while lockmgr() returns 0 if successful. This difference was
the source of minor confusion and porting mistakes in the past.
In fact, our driver porting document also didn't point out this
difference. I will fix some of these little issues in a separate

3 years agoobjcache: Add sysctl to expose objcache statistics.
Sepherosa Ziehau [Sat, 21 Jul 2018 08:07:13 +0000 (16:07 +0800)]
objcache: Add sysctl to expose objcache statistics.

3 years agodisklabel64.8: Fix several "disklabel" to be "disklabel32"
Aaron LI [Sat, 21 Jul 2018 05:07:56 +0000 (13:07 +0800)]
disklabel64.8: Fix several "disklabel" to be "disklabel32"

And improve a sentence.

3 years agoUpdate the pciconf(8) database.
Sascha Wildner [Fri, 20 Jul 2018 12:11:54 +0000 (14:11 +0200)]
Update the pciconf(8) database.

June 29, 2018 snapshot from https://pci-ids.ucw.cz

3 years agokernel/sysctl: Add handling of uint32_t.
Sascha Wildner [Fri, 20 Jul 2018 11:38:22 +0000 (13:38 +0200)]
kernel/sysctl: Add handling of uint32_t.

3 years agorc: Bring in a simple mechanism to run rc scripts only once.
Brad Hoffman [Wed, 18 Jul 2018 14:41:03 +0000 (14:41 +0000)]
rc: Bring in a simple mechanism to run rc scripts only once.

The basic mechanism is: If /firstboot exists, rc will also run all
scripts that have the "firstboot" keyword, then delete /firstboot.

This is a simpler version of FreeBSD's work. Specifically, we hardcode
the firstboot sentinel's name to /firstboot and we also remove it a
bit more simply because we assume that at the end of /etc/rc, root is

This mechanism is used for example by sysutils/ec2-scripts and is in
preparation for the upcoming ena(4) driver import.

Based-on: FreeBSD

3 years agoif_tun: Allow IP packets of length TUNMRU with TUNSIFHEAD set
Aaron LI [Tue, 17 Jul 2018 11:57:55 +0000 (19:57 +0800)]
if_tun: Allow IP packets of length TUNMRU with TUNSIFHEAD set

Obtained-from: FreeBSD (revision 300205)

3 years agoif_tun: Raise maximum MTU to be 65535 bytes
Aaron LI [Thu, 5 Jul 2018 06:08:43 +0000 (14:08 +0800)]
if_tun: Raise maximum MTU to be 65535 bytes

This is used, for example, by packetdrill to test with MTU's up to the
maximum value.

Taken-from: FreeBSD (revision 300603)

3 years agoif_tun: Disallow change network device type
Aaron LI [Mon, 9 Jul 2018 04:45:24 +0000 (12:45 +0800)]
if_tun: Disallow change network device type

Disallow ioctl(2) to change the network device type of tun(4).
Otherwise, page faults and panics can happen when access uninitialized
fields in the "struct ifnet" which are specific to the network device

Obtained-from: FreeBSD (revision 326362)

3 years agoif_tun: Implement interface clone support
Aaron LI [Sun, 8 Jul 2018 13:07:20 +0000 (21:07 +0800)]
if_tun: Implement interface clone support

Now 'ifconfig tunX create' and 'ifconfig tunX destroy' work.

The tun device will be automatically destroyed when being closed,
except for the manually created tun device/interface by
'ifconfig tunX create', similar to the tap(4) device.

This interface clone support is based on the if_tap device.

3 years agoif_tun: Better name interface-related functions
Aaron LI [Sun, 8 Jul 2018 11:55:36 +0000 (19:55 +0800)]
if_tun: Better name interface-related functions

Rename interface-related functions to be 'tunifxxx', and reorder a
bit to better group them.

Tweak the styles and improve debug messages a bit.

3 years agoif_tun: Add sysctl net.link.tun.{refcnt,debug}
Aaron LI [Sun, 8 Jul 2018 02:17:20 +0000 (10:17 +0800)]
if_tun: Add sysctl net.link.tun.{refcnt,debug}

Add read-only sysctl net.link.tun.refcnt to show the number of opened

Add sysctl net.link.tun.debug to be a alias to debug.if_tun_debug.

3 years agoif_tun: Support module load and unload
Aaron LI [Sun, 8 Jul 2018 01:43:12 +0000 (09:43 +0800)]
if_tun: Support module load and unload

Track the created tun devices in a list, and record the number of opened
tun devices.  Destroy all tun devices when unloading the module.

Mainly based on if_tap.

3 years agoif_tun: Add "cdev_t tun_dev" to tun_softc struct
Aaron LI [Sat, 7 Jul 2018 15:21:18 +0000 (23:21 +0800)]
if_tun: Add "cdev_t tun_dev" to tun_softc struct

Similar to if_tap, save the tun device in the tun_softc struct.

3 years agoif_tun: Use pointer to ifnet in tun_softc struct
Aaron LI [Sat, 7 Jul 2018 15:16:19 +0000 (23:16 +0800)]
if_tun: Use pointer to ifnet in tun_softc struct

Use a pointer to the ifnet struct in the tun_softc struct, instead of
embedding a full ifnet struct in it.  (similar to FreeBSD's)

Use if_alloc() to allocate the ifnet struct.

3 years agoif_tun: Update tun.4 man page to match the code
Aaron LI [Tue, 17 Jul 2018 11:04:12 +0000 (19:04 +0800)]
if_tun: Update tun.4 man page to match the code

Mainly follow FreeBSD's tun.4, refer to NetBSD's tun.4, and with my own
minor adjustments.

3 years agoif_tun: Some small tweaks and cleanups
Aaron LI [Sat, 7 Jul 2018 12:49:04 +0000 (20:49 +0800)]
if_tun: Some small tweaks and cleanups

* Consistently use the TUN define instead of "tun".

* Use variable "sc" instead of "tp" to refer to "struct tun_softc".

* Use variable "ifp" (struct ifnet *) to make code more readable.

* Static the bitmap variable.

* Various style tweaks.

3 years agoif_tap: Restore SIOCGIFFLAGS, SIOC[GS]IFADDR ioctls for tapioctl()
Aaron LI [Thu, 19 Jul 2018 07:04:35 +0000 (15:04 +0800)]
if_tap: Restore SIOCGIFFLAGS, SIOC[GS]IFADDR ioctls for tapioctl()

These ioctls allow basic control of the network interface via the device
file (/dev/tapX).  For example, our vke(4) device currently uses the

3 years agolibc - MFC resolver fix
Matthew Dillon [Tue, 17 Jul 2018 18:37:20 +0000 (11:37 -0700)]
libc - MFC resolver fix

* Allows intermediate domain names with an underscore.

* Fixes lookups of 'www.office.com' and 'www.newegg.com', and
  probably other domains.

Reported-by: kerma
Diagnosed-by: kerma, tautology
3 years agoRevert "if_tap: Get rid of arpcom struct from tap_softc struct"
Aaron LI [Tue, 17 Jul 2018 09:58:35 +0000 (17:58 +0800)]
Revert "if_tap: Get rid of arpcom struct from tap_softc struct"

This reverts commit 78e1ab4a8fc0074361116dedb55e6dc02baea351, with
minor adjustments to reduce the diff.

Thank sephe for pointint out the problem with that commit, which
breaks the 'ether_ifattach()' as well as some IPv6 stuffs that
assume the existence of 'arpcom'.

3 years agoioctl.9: Remove some obsolete commented out info.
Sascha Wildner [Tue, 17 Jul 2018 09:23:47 +0000 (11:23 +0200)]
ioctl.9: Remove some obsolete commented out info.

3 years agoif_tap: Disallow change network device type
Aaron LI [Tue, 17 Jul 2018 06:29:44 +0000 (14:29 +0800)]
if_tap: Disallow change network device type

Disallow ioctl(2) to change the network device type of tap(4).
Otherwise, page faults and panics can happen when access uninitialized
fields in the "struct ifnet" which are specific to the network device

Obtained-from: FreeBSD (revision 326362)

3 years agoif_tap: Add TAPGIFNAME ioctl to get interface name
Aaron LI [Fri, 13 Jul 2018 07:43:07 +0000 (15:43 +0800)]
if_tap: Add TAPGIFNAME ioctl to get interface name

This is a convenient shortcut to obtain the network interface name using
file descriptor for character device.

This ioctl is obtained from FreeBSD (revision 182880) which was further
obtained from NetBSD.  This ioctl is used by softwares such as QEMU.

Bump __DragonFly_version and update tap.4 man page.

3 years agoif_tap: Remove the broken vmnet support
Aaron LI [Fri, 13 Jul 2018 05:04:35 +0000 (13:04 +0800)]
if_tap: Remove the broken vmnet support

The vmnet feature provided by tap(4) was intended to be used by the
VMWare port that runs as the server side to communicate with its clients.
However, our tap(4) was updated a lot in the past but left the vmnet
function broken.  In addition, we don't have the VMWare server and thus
the vmnet function isn't needed in the foreseeable future.
So just remove it.

Discussed-with: swildner, sephe

3 years agoif_tap: Update tap.4 man page to match the code
Aaron LI [Mon, 9 Jul 2018 10:53:42 +0000 (18:53 +0800)]
if_tap: Update tap.4 man page to match the code

Remove the description on FIONBIO ioctl since ours doesn't support it.

Mainly taken from FreeBSD, with some improvements.

3 years agoif_tap: Return error instead of system panic
Aaron LI [Sun, 8 Jul 2018 08:37:24 +0000 (16:37 +0800)]
if_tap: Return error instead of system panic

Return error when failed to create/find the device and to allocate
the interface struct, instead of system panic.

3 years agoif_tap: Remove redundant unit from tapcreate() and tun_softc
Aaron LI [Sun, 8 Jul 2018 07:16:56 +0000 (15:16 +0800)]
if_tap: Remove redundant unit from tapcreate() and tun_softc

The tap interface unit number is the same as minor number of the
associated tap device, so remove the redundant "unit" argument
from tapcreate() function as well as the "tap_unit" entry from
tun_softc struct.

Meanwhile, improve the debug messages.

3 years agoif_tap: Get rid of arpcom struct from tap_softc struct
Aaron LI [Sun, 8 Jul 2018 06:09:29 +0000 (14:09 +0800)]
if_tap: Get rid of arpcom struct from tap_softc struct

Remove the ancient arpcom struct from the tap_softc struct,
meanwhile introduce the "tap_ifp" member that points to the
interface (ifnet struct) associating with the tap device.

3 years agoif_tap: Destroy the autoclone device when unload module
Aaron LI [Sun, 8 Jul 2018 04:30:55 +0000 (12:30 +0800)]
if_tap: Destroy the autoclone device when unload module

Use destroy_autoclone_dev(), which replaces both devfs_clone_handler_del()
and devfs_clone_bitmap_uninit(), to destroy the autoclone device /dev/tap
when unload the module.

Without this fix, the autoclone device /dev/tap is left over when the
module is unloaded.

3 years agoif_tap: Add read-only sysctl net.link.tap.refcnt
Aaron LI [Sun, 8 Jul 2018 02:05:31 +0000 (10:05 +0800)]
if_tap: Add read-only sysctl net.link.tap.refcnt

Expose the number of opened devices as a read-only sysctl:

Improve the debug messages with respect to the refcnt.

3 years agoif_tap: Remove global variable "taplastunit"
Aaron LI [Sat, 7 Jul 2018 12:21:45 +0000 (20:21 +0800)]
if_tap: Remove global variable "taplastunit"

This global variable isn't helpful.  In addition, the tap units can be

3 years agoif_tap: Some small tweaks and cleanups
Aaron LI [Sat, 7 Jul 2018 10:57:10 +0000 (18:57 +0800)]
if_tap: Some small tweaks and cleanups

* Consistently use the TAP define instead of "tap", also remove the
  CDEV_NAME define.

* Consistently use "tap_if" instead of "arpcom.ac_if".

* Better name the kqueue functions, and move the structs to the beginning.

* Reorder to better group related functions.

* Explicitly include the required <sys/queue.h> header.

* Use variable "sc" instead of "tp" to refer to "struct tap_softc".

* Staticize the bitmap variable.

* Use the variable unit = minor(dev) more.

* Improve the debug messages.

* Various minor style tweaks and cleanups.

3 years agotest - Test after repository move to SSD
Matthew Dillon [Fri, 13 Jul 2018 17:31:32 +0000 (10:31 -0700)]
test - Test after repository move to SSD

* Test after repository move to SSD

3 years agoDisable cert verification for pkg-bootstrap when no cert.pem
Aaron LI [Thu, 12 Jul 2018 03:38:48 +0000 (11:38 +0800)]
Disable cert verification for pkg-bootstrap when no cert.pem

Our site uses HTTPs and fetch(1) requires /etc/ssl/cert.pem or
/usr/local/etc/ssl/cert.pem to verify the server's certificate.
However, when one needs to bootstrap the 'pkg', that cert.pem
generally doesn't exist since it is installed by the ca_root_nss
package.  So disable certificate verification for fetch(1) in
such a case.

Split out 'pkg-bootstrap-{fetch,install}' targets to get rid of
some duplicate codes.

3 years agonvme - Do a better job backing out of probe errors
Matthew Dillon [Wed, 11 Jul 2018 18:45:38 +0000 (11:45 -0700)]
nvme - Do a better job backing out of probe errors

* AWS provides nvme interfaces which might not have attached volumes.
  Improve stability on AWS nvme (still needs more work).  Play nice
  when queue creation fails.  Do a better job tracking MSI-X
  interrupt installation and removal.

3 years agomisc - Allow /usr/dports to be a null-mount
Matthew Dillon [Wed, 11 Jul 2018 18:44:24 +0000 (11:44 -0700)]
misc - Allow /usr/dports to be a null-mount

* Don't punt on rm -rf /usr/dports if /usr/dports cannot be
  deleted.  It might be a null mount.

3 years agohostname(1): Add a compat option -f to print the FQDN (our default).
Sascha Wildner [Tue, 10 Jul 2018 13:01:15 +0000 (15:01 +0200)]
hostname(1): Add a compat option -f to print the FQDN (our default).

This should fix the build of multimedia/libcec.

Found-in: FreeBSD

3 years agosbin/hammer2: Explicitly include <sys/stat.h> for stat(2)
Tomohiro Kusumi [Sat, 7 Jul 2018 12:28:56 +0000 (05:28 -0700)]
sbin/hammer2: Explicitly include <sys/stat.h> for stat(2)

Fix compile error on Linux.

3 years agosbin/hammer2: Drop unused header includes in icrc.c
Tomohiro Kusumi [Sat, 7 Jul 2018 08:07:21 +0000 (01:07 -0700)]
sbin/hammer2: Drop unused header includes in icrc.c

libdmsg, UUID, and HAMMER2 ondisk definitions are not needed
for CRC calculation.

3 years agodiffutils: Update README.DELETED.
Sascha Wildner [Sat, 7 Jul 2018 21:04:18 +0000 (23:04 +0200)]
diffutils: Update README.DELETED.

3 years agoMerge branch 'vendor/DIFFUTILS'
Sascha Wildner [Sat, 7 Jul 2018 21:03:23 +0000 (23:03 +0200)]
Merge branch 'vendor/DIFFUTILS'

3 years agodiffutils: Remove another unneeded file from the vendor branch.
Sascha Wildner [Sat, 7 Jul 2018 21:01:37 +0000 (23:01 +0200)]
diffutils: Remove another unneeded file from the vendor branch.

3 years agohier.7: Mention /rescue.
Sascha Wildner [Sat, 7 Jul 2018 20:36:59 +0000 (22:36 +0200)]
hier.7: Mention /rescue.

3 years agoopenpam: Local adjustments for the Resedacea upgrade.
Sascha Wildner [Sat, 7 Jul 2018 18:27:32 +0000 (20:27 +0200)]
openpam: Local adjustments for the Resedacea upgrade.

3 years agoMerge branch 'vendor/OPENPAM'
Sascha Wildner [Sat, 7 Jul 2018 18:26:09 +0000 (20:26 +0200)]
Merge branch 'vendor/OPENPAM'

3 years agoImport OpenPAM Resedacea.
Sascha Wildner [Sat, 7 Jul 2018 18:23:48 +0000 (20:23 +0200)]
Import OpenPAM Resedacea.

See HISTORY for the details.

3 years agoFix remaining references to mkinitrd.8 to initrd.7
Aaron LI [Fri, 6 Jul 2018 06:39:44 +0000 (14:39 +0800)]
Fix remaining references to mkinitrd.8 to initrd.7

Reported-by: swildner
3 years agosys/vfs/hammer: Cleanup CRC functions
Tomohiro Kusumi [Thu, 5 Jul 2018 05:44:02 +0000 (22:44 -0700)]
sys/vfs/hammer: Cleanup CRC functions

The inner cmp in nested `vol_version >= HAMMER_VOL_VERSION_SEVEN`
conditional in hammer_crc_test_xxx() mostly get optimized out by gcc,
so not much reason to have __hammer_crc_get_xxx() in case of retry
using old CRC.

3 years agolibtelnet: Fix styles in sra.c
Aaron LI [Thu, 5 Jul 2018 11:49:49 +0000 (19:49 +0800)]
libtelnet: Fix styles in sra.c

Fix various small style(9) issues in sra.c, making some of the logic

3 years agotelnet(1): Disable PAM for the rescue version
Aaron LI [Thu, 5 Jul 2018 09:04:51 +0000 (17:04 +0800)]
telnet(1): Disable PAM for the rescue version

This avoids several PAM-related libraries when crunching telnet, and
reduces the size by about 200 KB.

3 years agolibtelnet: Fix build with NOPAM
Aaron LI [Thu, 5 Jul 2018 08:50:46 +0000 (16:50 +0800)]
libtelnet: Fix build with NOPAM

Also don't perform a check for "secure" tty for root logins when using
PAM; that is what we provide pam_security(8) for.

Taken-from: NetBSD (lib/libtelnet/sra.c, v1.6)

3 years agolibtelnet: Some small updates to sra.c from NetBSD
Aaron LI [Thu, 5 Jul 2018 08:47:29 +0000 (16:47 +0800)]
libtelnet: Some small updates to sra.c from NetBSD

* Define 'SMALL_LEN' and 'XSMALL_LEN' to replace the explicit numbers.
  (also replaced the original PASS_SIZE)

* Use 'strlcpy()' and 'snprintf()' when appropriate.

* Clean some type casts.

* Some style(9) tweaks.

3 years agowcscoll.3: Remove leading '+' from copy/paste from a patch.
Sascha Wildner [Thu, 5 Jul 2018 06:16:36 +0000 (08:16 +0200)]
wcscoll.3: Remove leading '+' from copy/paste from a patch.

3 years agoobjcache: Add stat counting # of exhaustion.
Sepherosa Ziehau [Wed, 4 Jul 2018 15:10:20 +0000 (23:10 +0800)]
objcache: Add stat counting # of exhaustion.

Use it to supress exhaustion warning; nuke no longer used 'exhausted'
field in objcache struct.

3 years agoobjcache: Move rarely used but useful bits into their own structure.
Sepherosa Ziehau [Wed, 4 Jul 2018 14:57:56 +0000 (22:57 +0800)]
objcache: Move rarely used but useful bits into their own structure.

3 years agoobjcache: Use u_long for stats.
Sepherosa Ziehau [Wed, 4 Jul 2018 14:17:05 +0000 (22:17 +0800)]
objcache: Use u_long for stats.

Add a new stat to count # of allocation.

3 years agoinitrd: Refactor Makefile and introduce quick{rescue,initrd}
Aaron LI [Wed, 4 Jul 2018 03:14:27 +0000 (11:14 +0800)]
initrd: Refactor Makefile and introduce quick{rescue,initrd}

Refactor the Makefile by splitting the original targets into smaller

Introduce targets quick{rescue,initrd} which skip the clean step.
Such similar behavior was achieved by passing '-DNO_CLEAN' to make.
(suggested-by: swildner)

3 years agoinitrd: Crunch grep/diff/telnet to rescue tools
Aaron LI [Sat, 30 Jun 2018 13:49:45 +0000 (21:49 +0800)]
initrd: Crunch grep/diff/telnet to rescue tools

NOTE: These tools depend on their corresponding internal libraries.

This adds about 1MB to the rescue tools.

3 years agomk/crunchgen: Support internal libraries
Aaron LI [Sat, 30 Jun 2018 13:44:30 +0000 (21:44 +0800)]
mk/crunchgen: Support internal libraries

Add "CRUNCH_INTLIBS" and "CRUNCH_INTLIB_${P}" to support the building
and linkage of internal libraries.

Also properly handle the "obj" etc. targets for internal libraries.

Meanwhile, add "CRUNCH_LIB_${P}" and "CRUNCH_KEEP_${P}" to the comments.

3 years agocrunchgen(1): Support building and linking internal libraries
Aaron LI [Sat, 30 Jun 2018 13:36:54 +0000 (21:36 +0800)]
crunchgen(1): Support building and linking internal libraries

Some programs (e.g., grep, diff, telnet) use internal libraries.  In
order to crunch such programs, the corresponding internal libraries
must be built together with the programs and then are used to create
the <progname>.lo.

Extend the crunchgen(1)'s "special" command by adding the "lib_int"
keyword, which specifies the internal libraries to be used to create
the <progname>.lo.

The "libs_int" command is also implemented to support building the
needed internal libraries which will be statically linked to create
the final crunched executable.

3 years agocrunchgen(1): Small updates and cleanups
Aaron LI [Sat, 30 Jun 2018 05:51:12 +0000 (13:51 +0800)]
crunchgen(1): Small updates and cleanups

* Use realpath(3) to replace the hack of using popen/pwd.

* Add function iseq() to replace strcmp().

* Use {} for make variables.

* Various style(9) tweaks.

3 years agoinitrd: Handle ${DESTDIR} when building rescue tools
Aaron LI [Wed, 27 Jun 2018 01:36:05 +0000 (09:36 +0800)]
initrd: Handle ${DESTDIR} when building rescue tools

When building rescue tools for a target system (e.g., create release
build), use tools (e.g., crunchide, crunchgen, cc), headers and libraries
from the target root (${DESTDIR}).

GCC is more tolerant (e.g., doesn't warn about unused variables) to
system headers than user headers, so we have to use "-isystem <inc_dir>"
instead of "-I<dir>", but the former (option syntax) causes difficulty
for <bsd.dep.mk> to filter the options to call mkdep(1).  Therefore, we
use "--sysroot=${DESTDIR}" and it's simpler than specifying headers paths
with "-I<dir>" and library paths with "-L<dir>".

Meanwhile, improve the commands logic in Makefile, and set LC_ALL=C.

3 years agocrunchgen(1): Add "linkopts" to specify linker options
Aaron LI [Wed, 13 Jun 2018 01:42:47 +0000 (09:42 +0800)]
crunchgen(1): Add "linkopts" to specify linker options

Currently, the link options (e.g., library search directories) are
appended to the "libs" directive.  Moreover, crunchgen discards
duplicates in such string lists.
For example, "-L /lib -L /usr/lib" becomes "-L /lib /usr/lib".

Add the "linkopts" directive to record the options for linking the
final crunched binary.  This makes the "libs" directive cleaner,
and helps crunchgen to detect duplicates between "libs" and "libs_so".

Update the crunchgen.1 man page.

Update mk/bsd.crunchgen.mk against the new "linkopts" directive.

Clean up crunchgen.c a bit.

3 years agocrunchgen(1): Improve the skeleton program
Aaron LI [Tue, 12 Jun 2018 01:33:17 +0000 (09:33 +0800)]
crunchgen(1): Improve the skeleton program

* Sort the name of crunched tools (for easier finding available tools).

* Do not print the name of itself in usage.

* Remove the unused crunched_here() function.

* Style updates (taken-from: NetBSD)

3 years agoinitrd: Add real scp(1)
Aaron LI [Mon, 11 Jun 2018 12:58:36 +0000 (20:58 +0800)]
initrd: Add real scp(1)

scp(1) and ssh(1) are different tools, so the original "scp" alias
doesn't work actually.  Add real scp(1) now.

Meanwhile, alias "ssh" to "slogin" as the same as the base system.

Remove the symbol keep statement as it's no longer needed.

3 years agoinitrd: Reorganize and crunch 70 more rescue tools
Aaron LI [Sun, 10 Jun 2018 06:43:02 +0000 (14:43 +0800)]
initrd: Reorganize and crunch 70 more rescue tools

* Merge "rescue.sbin" into "rescue" to save space (avoid duplicated
  libraries to be linked).

* Move "lvm" out of "rescue.libcrypto" since lvm(8) doesn't need libcrypto.

* Crunch 70 more tools (aliases not counted):

  awk, basename, bc, bzip2, cap_mkdb, chflags, chown, cmp, cpio, cut,
  date, dirname, dmsetup, dump, ed, env, expr, false, find, fstyp, gzip,
  head, hexdump, hostname, id, join, kcollect, kdump, kenv, ktrace,
  ldconfig, lsvfs, mount_devfs, nc, paste, patch, pax, pkill, printf,
  pw, pwd_mkdb, rcorder, realpath, relpath, restore, rtsold, savecore,
  sed, sort, stat, stty, tail, tar, tee, touch, tput, tr, traceroute,
  traceroute6, true, truss, uname, uniq, varsym, vi, vipw, vnconfig, wc,
  xz, yes

  awk, bzip2, chown, cpio, find, gzip, nc, pw, sed, tar, vi, xz

  Now the total number of crunched rescue tools more than 230 (including
  aliases), but the total size remains almost the same :-)

* Improve the makefiles to be much cleaner.

3 years agolibedit: No need of the bundled fgetln, vis and wcsdup
Aaron LI [Mon, 11 Jun 2018 07:59:11 +0000 (15:59 +0800)]
libedit: No need of the bundled fgetln, vis and wcsdup

All these functions are provided in libc, so remove them from libedit
to avoid symbol conflict (e.g., crunching many tools).

Meanwhile, the libedit's config.h already have proper defines for the
above functions.

3 years agobsd-family-tree: Sync yet again with FreeBSD.
Sascha Wildner [Wed, 4 Jul 2018 08:21:55 +0000 (10:21 +0200)]
bsd-family-tree: Sync yet again with FreeBSD.

3 years agolibssh: No need of compat vis.c as we support VIS_ALL
Aaron LI [Mon, 11 Jun 2018 05:29:31 +0000 (13:29 +0800)]
libssh: No need of compat vis.c as we support VIS_ALL

This helps avoid the vis.o symbol conflicts between libc and libssh.

3 years agovis(1): Add option -a to use VIS_ALL
Aaron LI [Mon, 11 Jun 2018 04:47:36 +0000 (12:47 +0800)]
vis(1): Add option -a to use VIS_ALL

Taken-from: OpenBSD

3 years agovis(3): Add VIS_ALL support
Aaron LI [Mon, 11 Jun 2018 04:44:07 +0000 (12:44 +0800)]
vis(3): Add VIS_ALL support

OpenSSH requires VIS_ALL and therefore uses the version bundled with
itself, but this causes the vis.o symbol conflicts between libc and
libssh when crunching fstyp(8) with ssh(1).

Bump __DragonFly_version.

Based-on: OpenBSD

3 years agoopenssh: Removed unused vis.[ch] from the vendor branch
Aaron LI [Wed, 4 Jul 2018 05:01:41 +0000 (13:01 +0800)]
openssh: Removed unused vis.[ch] from the vendor branch

Our libc's vis(3) now supports VIS_ALL, which is required by libssh.

3 years agolib/libdmsg: Fix compile-time warning on Linux
Tomohiro Kusumi [Wed, 4 Jul 2018 04:39:34 +0000 (21:39 -0700)]
lib/libdmsg: Fix compile-time warning on Linux

warning: pointer targets in passing argument 2 of 'crypto_algos[0].init' differ in signedness
note: expected 'char *' but argument is of type 'uint8_t *'

3 years agoDo not auto build rescue tools when ${DESTDIR} != "/"
Aaron LI [Tue, 3 Jul 2018 12:15:17 +0000 (20:15 +0800)]
Do not auto build rescue tools when ${DESTDIR} != "/"

When installworld to an alternative root (i.e., ${DESTDIR} != "/"),
do not automatically build the rescue tools.

This change won't affect the nrelease build, since it will explicitly
do 'make initrd'.

Suggested-by: swildner
3 years agoobjcache: Fix comment indentation.
Sepherosa Ziehau [Tue, 3 Jul 2018 14:52:30 +0000 (22:52 +0800)]
objcache: Fix comment indentation.

3 years agoobjcache: Use __predict for predictable conditions.
Sepherosa Ziehau [Tue, 3 Jul 2018 14:46:22 +0000 (22:46 +0800)]
objcache: Use __predict for predictable conditions.

3 years ago<sys/gpt.h>: Fix a minor comment issue
Aaron LI [Tue, 3 Jul 2018 11:42:48 +0000 (19:42 +0800)]
<sys/gpt.h>: Fix a minor comment issue

3 years agoobjcache: Fix comment style
Sepherosa Ziehau [Mon, 2 Jul 2018 15:55:41 +0000 (23:55 +0800)]
objcache: Fix comment style

3 years agoobjcache: Constify object cache name.
Sepherosa Ziehau [Mon, 2 Jul 2018 15:05:07 +0000 (23:05 +0800)]
objcache: Constify object cache name.

3 years agoAdd the initrd.7 man page
Aaron LI [Sun, 1 Jul 2018 05:23:59 +0000 (13:23 +0800)]
Add the initrd.7 man page

This man page is partly based on the removed mkinitrd.8 man page
written by Alex Hornung.

Reviewed-by: Sascha Wildner