FreeBSD/src 336358head/sys/conf Makefile.amd64 Makefile.arm

Partially revert r336353: sys/conf/* %VERSREQ bumps

The changes made in r335998 don't strictly require a newer config(8),
though it is advised. The %VERSREQ bumps were premature.

FreeBSD/ports 474759branches 2018Q3, branches/2018Q3/graphics/sekrit-twc-zimg distinfo Makefile

MFH: r474709

graphics/sekrit-twc-zimg: update to 2.7.5

Approved by:    ports-secteam (miwi)

FreeBSD/src 336357head/sys/fs/nfs nfsproto.h, head/sys/fs/nfsserver nfs_nfsdstate.c nfs_nfsdserv.c

Modify the reasons for not issuing a delegation in the NFSv4.1 server.

The ESXi NFSv4.1 client will generate warning messages when the reason for
not issuing a delegation is two. Two refers to a resource limit and I do
not see why it would be considered invalid. However it probably was not the
best choice of reason for not issuing a delegation.
This patch changes the reasons used to ones that the ESXi client doesn't
complain about. This change does not affect the FreeBSD client and does
not appear to affect behaviour of the Linux NFSv4.1 client.
RFC5661 defines these "reasons" but does not give any guidance w.r.t. which
ones are more appropriate to return to a client.

Tested by:      andreas.nagy at
PR:            226650
MFC after:      2 weeks

FreeBSD/ports 474758head/devel/awscli distinfo Makefile

devel/awscli: Update 1.15.55 -> 1.15.59

Sponsored by:   Miles AS

FreeBSD/ports 474757head/misc/ansiweather distinfo Makefile

FreeBSD/ports 474756head/devel/py-botocore distinfo Makefile

devel/py-botocore: Update 1.10.54 -> 1.10.58

Sponsored by:   Miles AS

FreeBSD/ports 474755head/security/tripwire12 Makefile

Schedule for deletion: unfetchable.

FreeBSD/src 336356head/sys/dev/e1000 if_em.c

Update igb_sctx_init for r336313, missed when incorporating shurd@'s
feedback on the initial D15720.

Reported by:    kib

FreeBSD/src 336355head/sys/cddl/dev/dtrace/powerpc dtrace_isa.c

dtrace/powerpc: Correct register indices for non-indexed registers in the trapframe

Fix an off-by-one error, LR starts at index 32, not index 33, and the others
follow suit.

FreeBSD/src 336354head/stand/i386/zfsboot zfsboot.c

zfsboot: fix build with WITHOUT_LOADER_GELI

Reviewed by:    ian
Sponsored by:   The FreeBSD Foundation
Differential Revision:

FreeBSD/src 336353head/sys/conf Makefile.amd64 Makefile.arm

config(8): Bump major version after r335998

config-generated hints.c/env.c from r335998 and later are incompatible with
earlier kernels due to no longer setting envmode/hintmode. A minor bump for
this is insufficient, as matching major version with a later minor version
is still viewed as backwards-compatible.

This was an MI kernel change, soo all VERSREQ's are bumped.

FreeBSD/src 336352head/sys/geom/eli g_eli_crypto.c g_eli.h, head/sys/kgssapi/krb5 kcrypto_aes.c kcrypto_des.c

OCF: Convert consumers to the session id typedef

These were missed in the earlier r336269.

No functional change.

Sponsored by:   Dell EMC Isilon

FreeBSD/src 336351head/gnu/lib/libstdc++ config.h

Update libstdc++ configuration.

Its been quite a while since the last time we updated this and since then
we have grown iconv and a bunch of complex math functions.

This only applies to the platforms which still use GCC 4.2.1 in the

Differential Revision:

FreeBSD/src 336350head/usr.sbin/sysrc sysrc

sysrc(8): Send error message to stderr (not stdout)

PR:            bin/229806
Reported by:    Andreas Sommer <andreas.sommer87 at>
MFC after:      3 days
X-MFC-to:       stable/11 stable/10 stable/9
Sponsored by:   Smule, Inc.

FreeBSD/doc 52013head/en_US.ISO8859-1/books/porters-handbook/flavors chapter.xml

Fix a typo in Porter's Handbook.

PR:     229776
Submitted by:   Max Stucchi <max at>

FreeBSD/ports 474754head/net/torsocks Makefile distinfo

net/torsocks: Fetch distfile from official repository

PR:            229544
Submitted by:   Vinícius Zavam <egypcio at>

FreeBSD/ports 474753head/graphics/flam3 Makefile distinfo, head/graphics/flam3/files patch-png.c sincos.c

graphics/flam3: Update 2.7.18 -> 3.1.1-5

Port changes:
* Change to github
* Update COMMENT
* Change to shared library
* Add the ad-hoc implemantation for sincos linuxism

PR:            229193
Approved by:    maintainer's timeout (john.c.prather at; 25 days)

FreeBSD/src 336349head/sys/sys pcpu.h

Don't use the static keyword with DPCPU defines in arm64 modules.

On arm64 compiler will create PC-relative loads and stores for static data.
This means it doesn't emit a relocation. Unfortunately the in-kernel linker
expects there to be one for DPCPU defines so it can modify its value so the
code will use the correct DPCPU region.

To workaround the lack of a relocation with static data remove it when
building modules on arm64. The kernel is unaffected as it doesn't rely on
modifying these relocations to find the data.

PR:            225684
Reported by:    Johannes Lundberg <johalun0 at>
Reported by:    Jose Luis Duran <jlduran at>
Reported by:    Greg V <greg at>
Reviewed by:    bz
Sponsored by:   ABT Systems Ltd
Differential Revision:
+18-01 files

FreeBSD/ports 474752head/biology/htslib Makefile distinfo

biology/htslib: Update 1.6 -> 1.8

Port changes:
* Add USES=localbase instead of CPPFLAGS/LDFLAGS
* Move USES=ssl to CURL_USES=ssl
* Update WWW

PR:            228908
Approved by:    maintainer's timeout (cartwright at; 35 days)

FreeBSD/ports 474751head MOVED, head/deskutils Makefile

Remove expired ports:
2018-07-15 net/p5-ZConf-Bookmarks: Unmaintained
2018-07-15 net/p5-ZConf: Unmaintained
2018-07-15 textproc/p5-Text-SpellChecker-GUI: Unmaintained
2018-07-15 deskutils/p5-ZConf-Runner-GUI-GTK: Unmaintained
2018-07-15 deskutils/p5-ZConf-BGSet: Unmaintained
2018-07-15 deskutils/p5-ZConf-Runner: Unmaintained
2018-07-15 graphics/p5-Image-Size-FillFullSelect: Unmaintained
2018-07-15 graphics/p5-Imager-AverageGray: Unmaintained
2018-07-15 mail/p5-Mail-IMAPTalk-MailCache: Unmaintained
2018-07-15 mail/p5-ZConf-Mail: Unmaintained
2018-07-15 mail/p5-Mail-Cache: Unmaintained
2018-07-15 www/p5-ZConf-RSS: Unmaintained
2018-07-15 www/p5-ZConf-RSS-GUI-GTK: Unmaintained
2018-07-15 devel/p5-ZConf-GUI: Unmaintained
2018-07-15 net-im/mastodon: Breaks too frequently
2018-07-15 x11-fm/p5-PerlFM: Unmaintained
2018-07-15 astro/p5-ZConf-Weather: Unmaintained
2018-07-15 sysutils/p5-ZConf-Cron: Unmaintained

FreeBSD/ports 474750head MOVED, head/archivers/javatar Makefile

Remove java/jaf port, since the Java Activation Framework is included by
default in the JRE since Java 6 and we don't support Java 5 anymore.

Reviewed by:    eugen

FreeBSD/ports 474749head/x11-themes/xfce-evolution pkg-plist distinfo

x11-themes/xfce-evolution update to 4.10.1

PR:            229808
Submitted by:   J.R. Oldroyd <fbsd at> (maintainer)

FreeBSD/ports 474748head/sysutils/dupd Makefile

sysutils/dupd: marked as BROKEN

It doesn't build

FreeBSD/ports 474747head/www/sogo4 pkg-plist distinfo

- Update to 4.0.1

FreeBSD/ports 474746head/devel/sope4 distinfo Makefile

- Update to 4.0.1

FreeBSD/ports 474745head/editors/emacs-devel pkg-plist distinfo

- Update to git snapshot 9593108

FreeBSD/doc 52012svnadmin/conf mentors

Release ygy@ from mentorship.

Discussed with: delphij
Approved by:    doceng (implicit)

FreeBSD/src 336348head/sys/conf files.arm64, head/sys/crypto/armv8 stdint.h

Create an empty stdint.h for arm_neon.h to include.

The armv8crypto module includes arm_neon.h for the compiler intrinsic
functions. This includes the userland stdint.h file that doesn't exist in
the kernel. Fix this by providing an empty stdint.h to be used when we
include arm_neon.h.

Sponsored by:   DARPA, AFRL
Differential Revision:

FreeBSD/ports 474744head/lang/seed7 pkg-plist distinfo

lang/seed7: update to 05_20180708

- The operating system DOS is supported (with DJGPP) again. The tests
  have been done with Dosbox.
- In the compiler (in comp/const.s7i) the actions BIN_AND and BIN_OR
  have been added to the list of special actions. This way the
  functions rotLeft and rotRight (from bin32.s7i and bin64.s7i) are
  implemented as inline functions. This reduces the runtime of sha256
  (from msgdigest.s7i) by 44% (measured with gcc and valgrind, when
  reading data from 200 https connections). The cpu-time of the whole
  test program was reduced by 17%.
- In msgdigest.s7i the functions md4, md5, sha1, sha224 and sha256
  have been improved to use an index for words instead of an index
  for chunks. This simplifies the conversion to 32-bit words.
- In comp/action.s7i the function process_action has been improved to
  use a case-statement instead of multiple if-statements. This reduces
  the runtime of process_action by 39% (measured with gcc and valgrind,
  when the compiler compiles itself). The runtime of the compiler is
  reduced by 2.5%.
- The contents of the libraries enable_input.s7i and enable_output.s7i
  have been moved to the library enable_io.s7i.
- The library comp/expr_util.s7i has been renamed to comp/expr_utl.s7i.
- The program chkccomp.c has been improved to search 64-bit functions
  for fseek() and ftell(). The findings are stored in version.h with

    [27 lines not shown]

FreeBSD/src 336347head MAINTAINERS

Add pointer to freebsd-numerics for libm.
+1-01 files

FreeBSD/ports 474743head .gitauthors

.gitauthors: Add John Hixon (jhixson)
+1-01 files

FreeBSD/src 336346stable/11/lib/libnv/tests nvlist_append_test.c, stable/11/share/man/man9 cnv.9 Makefile

MFC r304910, r304912, r304915, r304952, r325019, r328164, r331094, r332664,
r335341-r335345, r335347, r335379-r335380, r335382

Introduce cnv man page.

Add missed header file for cnv.h .

Bump date in the man page.

Remove duplicated declaration.

Introduce cnvlist_name() and cnvlist_type() functions.

Those function can be used when we are iterating over nvlist to reduce
amount of extra variables we need to declare.

libnv: Use mallocarray(9) for the nv_calloc.


    [50 lines not shown]

FreeBSD/ports 474742svnadmin/conf access mentors

Welcome John Hixson (jhixson) to the rank of ports committer.

Kris Moore (kmoore), Martin Wilke (miwi) and Marcelo Araujo (araujo) will
be mentors.

Approved by:    portmgr

FreeBSD/src 336345stable/11/lib/libnv Makefile, stable/11/lib/libnv/tests Makefile

MFC r304908-r304909

Add cnv API.

cnv API is a set of functions for managing name/value pairs by cookie.
The cookie can be obtained by nvlist_next(), nvlist_get_parent() or
nvlist_get_pararr() function. This patch also includes unit tests.

Submitted by:   Adam Starak <starak.adam at>

Fix style issue in the cnv API.
Remove unused arguments in a macro.
Remove unused typedef.

FreeBSD/ports 474741head/audio/mp3guessenc distinfo Makefile

Update to 0.27.4

FreeBSD/ports 474740head/net/rubygem-gitaly-proto Makefile

Take maintainer as port is only used by gitlab-ce which I maintain, so I can sync the 
updates with the gitlab-ce updates.

Reviewed by:    tz (mentor)
Approved by:    sunpoet (maintainer by email), tz (mentor)
Differential Revision:

FreeBSD/src 336344stable 11, stable/11/sbin/ifconfig ifieee80211.c

MFC r335757:

ifconfig(8): Attempt to render non-printable sequences w/ UTF-8 Environment

Currently ifconfig(8) only prints the hex representation of ssid names
with non-ASCII characters. Many modern terminals are able to properly render
non-ASCII characters. This change checks if the terminal charmap is UTF-8,
and if so, will render the characters, rather than the hex value.

This behavior is circumvented by running ifconfig(8) in a non-UTF8 locale;
e.g. C or POSIX.

It was pointed out by kp@ during the review that APs have the option to
broadcast whether their SSIDs may be interpreted as UTF-8. Ideally, we would
honor this and only attempt this behavior if it's so-broadcasted by the AP.

However, a sample survey showed that hostapd will advertise this if
indicated in config but it doesn't seem to be so common in the AP market, so
this would be effectively useless as we'll rarely know if the SSID should be
renderable as UTF-8.

Despite this, it was decided to be OK with this anyways- there's a
straightforward path to doing it the right way based on advertisement by AP
if we need to go that route, and one can revert to old behavior easily
enough at runtime if we get it wrong.

FreeBSD/src 336343stable 11, stable/11/usr.sbin/config mkmakefile.c config.y

MFC r335652-r335654

config(8): Make 'env' files consistent with other file-accepting options

Previously, only one 'env' file could be specified. Later 'env' directives
would overwrite earlier 'env' directives. This is inconsistent with every
other file-accepting directives which process files in order, including

A caveat applies to both hints and env that isn't mentioned: they're
concatenated in the order of appearance, so they're not actually applied in
the way one might think by supplying:

hints x
hints y

Hints in x will take precedence over same-name hints in y due to how
the kernel processes them, stopping at the first line that matches the hint
we're searching for. Future work will flip the order of concatenation so
that later files may still properly override earlier files.

In practice, this likely doesn't matter at all due to the nature of the

    [25 lines not shown]

FreeBSD/ports 474739head/databases/rubygem-redis-namespace15 Makefile, head/devel/rubygem-grape-entity060 Makefile

Deprecate ports not required by gitlab-ce and any other port anymore.

Reviewed by:    tz (mentor)
Approved by:    tz (mentor)
Differential Revision:

FreeBSD/src 336342stable 11

Record-only MFC r336011-r336013

r336013 reverts the previous two commits, which broke the build due to poor
testing form.
+0-01 files

FreeBSD/src 336341stable 11

Record-only MFC of r335995, r335997; latter reverts the former
+0-01 files

FreeBSD/src 336340stable 11, stable/11/sys/kern kern_exec.c

MFC r336238:

Round down the location of execpathp to slightly improve copyout speed.

In practice, this moves the padding from below the canary to above
execpathp has no impact on stack consumption.

Submitted by:          Wuyang-Chung (via github pull request #159)

FreeBSD/ports 474738head/devel/jenkins distinfo Makefile

- Update to 2.132

Sponsored by:   The FreeBSD Foundation

FreeBSD/src 336339head/sys/arm/allwinner/clkng ccu_a83t.c

allwinner: a83t: Fix PLL_CPU clocks

The PLL_CPU clocks formula is 24Mhz * N and not 24Mhz / N
Fix it by using a NKMP clock with fixed factor values for the one

FreeBSD/src 336338stable 11, stable/11/usr.sbin/cpucontrol amd10h.c

MFC r336257, r336258, r336263:
Use the MSR name.

FreeBSD/src 336337head Makefile.inc1

Unconditionally build libnv in legacy

Rather than using a config(8) built from new tree linking libnv built on
+1-71 files

FreeBSD/ports 474737head/devel/aws-sdk-php pkg-plist distinfo

Update devel/aws-sdk-php to 3.63.1

Sponsored by:   Rubicon Communications, LLC (Netgate)

FreeBSD/doc 52011head/ja_JP.eucJP/articles/contributing article.xml

- Merge the following from the English version:

        r46482 -> r46486       head/ja_JP.eucJP/articles/contributing/article.xml

FreeBSD/ports 474736head/lang/julia distinfo Makefile, head/lang/julia/files patch-Makefile

lang/julia: update to 0.6.4

PR:            229799
Submitted by:   Iblis Lin <iblis at> (maintainer)

FreeBSD/ports 474735head/sysutils/dupd Makefile distinfo, head/sysutils/dupd/files patch-Makefile patch-src_utils.h

sysutils/dupd: Update to version 1.6

PR:            226841
Submitted by:   jyri at
Reviewed by:    tom at (maintainer)