BSD Commit Log Search

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master

Merge remote-tracking branch 'freebsd/stable/12' into hardened/12-stable/master

contrib/bc, usr.bin/gh-bc: merge update to version 5.1.1

This version of bc and dc is used by default on FreeBSD-13 and newer,
but remains optional on FreeBSD-12.x. It is enabled by building and
installing the world with WITH_GH_BC=yes defined in /etc/src.conf.

contrib/bc: update to version 4.0.2

Merge commit '2858419a0ee2b8f5827de72c00618bcd69ebc5fc'

This update fixes the initialization of "scale" to 20 if started with
-l and the initial statement leads to an error (e.g. contains a syntax
error). Scale was initialized to 0 in that case.

Another change is the support of job control in interactive mode with
line editing enabled. The control characters have been interpreted as
editing commands only, prior to this version.

(cherry picked from commit 8c39e25220bb88cd027d0c3b0fe86e52f6abd150)

    [120 lines not shown]

usr.bin/gh-bc, contrib/bc: update to version 5.0.0

Merge commit 2f57ecae4b98e76e5d675563785a7e6c59c868c4

This is a new major release with a number of changes and extensions:

- Limited the number of temporary numbers and made the space for them
  static so that allocating more space for them cannot fail.
- Allowed integers with non-zero scale to be used with power, places,
  and shift operators.
- Added greatest common divisor and least common multiple to lib2.bc.
- Made bc and dc UTF-8 capable.
- Added the ability for users to have bc and dc quit on SIGINT.
- Added the ability for users to disable prompt and TTY mode by
  environment variables.
- Added the ability for users to redefine keywords.
- Added dc's modular exponentiation and divmod to bc.
- Added the ability to assign strings to variables and array elements
  and pass them to functions in bc.

    [98 lines not shown]

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        libexec/rtld-elf/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)

Merge branch 'freebsd/current/main' into hardened/current/master

usr.bin/ghä-bc, contrib/bc: update to version 5.0.0

Merge commit 2f57ecae4b98e76e5d675563785a7e6c59c868c4

This is a new major release with a number of changes and extensions:

- Limited the number of temporary numbers and made the space for them
  static so that allocating more space for them cannot fail.
- Allowed integers with non-zero scale to be used with power, places,
  and shift operators.
- Added greatest common divisor and least common multiple to lib2.bc.
- Made bc and dc UTF-8 capable.
- Added the ability for users to have bc and dc quit on SIGINT.
- Added the ability for users to disable prompt and TTY mode by
  environment variables.
- Added the ability for users to redefine keywords.
- Added dc's modular exponentiation and divmod to bc.
- Added the ability to assign strings to variables and array elements
  and pass them to functions in bc.

    [6 lines not shown]

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/options/WITH_OFED_EXTRA (deleted)

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master

* freebsd/13-stable/main: (22 commits)
  [bc] Update to version 4.0.0
  cache: temporarily drop the assert that dvp != vp when adding an entry
  amd64: import asm strlen into libc
  amd64: implement strlen in assembly, take 2
  ifconfig: fix UBSan signed shift error
  libarchive: Make test_read_append_filter_wrong_program pass again
  tests/sys/net/routing: XFAIL the two failing tests
  resolv_test: Fix racy exit check, remove mutexes, and reduce output
  sys/dev/md: Drop unncessary __GLOBL(mfs_root)
  libsa: Remove conflicting .global/.weak directive
  lib/libc/net/nsdispatch.c: Fix missing unlock and add locking annotations
  RISC-V: Fix feenableexcept return value
  ng_macfilter_test: Skip rather than fail if there is no network
  Allow using sanitizers for ssp tests with out-of-tree compiler
  Always build the sanitizer runtimes when compiling with clang
  tools/build/make.py: Avoid calling brew --prefix on macOS unnecessarily

    [5 lines not shown]

Merge branch 'freebsd/12-stable/main' into hardened/12-stable/master

* freebsd/12-stable/main:
  [bc] Update to version 4.0.0
  net: fixing a memory leak in if_deregister_com_alloc()

[bc] Update to version 4.0.0

This version fixes an issue (missing pop of top-of-stack value in the
"P" command of the dc program).

This issue did not affect the bc program, since it does not use dc as
an back-end to actually perform the calculations as was the case with
the traditional bc and dc programs.

The major number has been bumped due to Windows support that has been
added to this version. It does not correspond to a major change that
might affect FreeBSD.

(cherry picked from commit b55a927bc884d7780d65a508572023b0dc2dede9)

[bc] Update to version 4.0.0

This version fixes an issue (missing pop of top-of-stack value in the
"P" command of the dc program).

This issue did not affect the bc program, since it does not use dc as
an back-end to actually perform the calculations as was the case with
the traditional bc and dc programs.

The major number has been bumped due to Windows support that has been
added to this version. It does not correspond to a major change that
might affect FreeBSD.

(cherry picked from commit b55a927bc884d7780d65a508572023b0dc2dede9)

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        usr.sbin/bsdinstall/scripts/mirrorselect (unresolved)1

Merge commit '7a590c074ceede12b2b6e794f8703d6fa5749918'

Update to version 4.0.0

This version fixes an issue (missing pop of top-of-stack value in the
"P" command of the dc program).

This issue did not affect the bc program, since it does not use dc as
an back-end to actually perform the calculations as was the case with
the traditional bc and dc programs.

The major number has been bumped due to Windows support that has been
added to this version. It does not correspond to a major change that
might affect FreeBSD.

Merge branch 'freebsd/12-stable/main' into hardened/12-stable/master

* freebsd/12-stable/main:
  bc: Upgrade to version 3.2.4
  Use C11 anonymous unions.

bc: Upgrade to version 3.2.4

This update changes the behavior of "-e" or "-f" in BC_ENV_ARGS:

Use of these options on the command line makes bc exit after executing
the given commands. These options will not cause bc to exit when
passed via the environment (but EOF in STDIN or -e or -f on the
command line will make bc exit as before).

The same applies to DC_ENV_ARGS with regard to the dc program.

Make length(0) and length(0.0) return 1 for compatibility with GNU bc
and the traditional FreeBSD bc.

Fix a potential division by zero error in a non-standard (extended)
math library function.

(cherry picked from commit e458944cf9deec51d03ec751050a58ddf43e796f)
(cherry picked from commit 9a995fe186257315e7b3d01e24c55d86bb18fd32)

    [4 lines not shown]

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master

* freebsd/13-stable/main:
  if_vtbe: Add missing includes to fix build
  bc: Vendor import new version 3.3.3
  [PowerPC64] Fix multiple issues in fpsetmask().
  [PowerPC] [PowerPCSPE] Fix multiple issues in fpsetmask().
  [PowerPC64LE] pseries: Fix input buffering logic.

bc: Vendor import new version 3.3.3

(cherry picked from commit 028616d0dd69a3da7a30cb94d35f040bf2ced6b9)

Make length(0) and length(0.0) return 1 for compatibility with GNU bc
and the traditional FreeBSD bc.

Fix a potential division by zero error in a non-standard (extended)
math library function.

Merge branch 'freebsd/current/main' into hardened/current/master

* freebsd/current/main:
  rack: unbreak TCP fast open for the client side
  zfs: update openzfs version reference to bedbc13da
  bc: Vendor import new version 3.3.3
  sbin/ifconfig: Minor housekeeping
  sbin/ifconfig: Get media status with libifconfig
  libifconfig: Overhaul ifconfig_media_* interfaces

bc: Vendor import new version 3.3.3

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master

* freebsd/13-stable/main:
  zfs: disable use of hardware crypto offload drivers
  zfs: fix panic if scrubbing after removing a slog device
  MFC 1c808fcd859f: Allocate BAR for ENA MSIx vector table
  bc: Upgrade to version 3.3.0
  ng_bridge.4: Use more suitable mandoc macros
  netgraph/ng_bridge: Add counters for the first link, too
  netgraph/ng_bridge: Document staleness in multithreaded operation
  netgraph/ng_bridge: Merge internal structures
  netgraph/ng_bridge: Make simple internal functions read-only
  netgraph/ng_bridge: switch stats to counter framework
  netgraph/ng_bridge: Derive forwarding mode from first attached hook
  netgraph/ng_bridge: Introduce "uplink" ports without MAC learning
  MFC jail: Change both root and working directories in jail_attach(2)
  pxeboot(8): remove antiquated information

bc: Upgrade to version 3.3.0

This update changes the behavior of "-e" or "-f" in BC_ENV_ARGS:

Use of these options on the command line makes bc exit after executing
the given commands. These options will not cause bc to exit when
passed via the environment (but EOF in STDIN or -e or -f on the
command line will make bc exit as before).

The same applies to DC_ENV_ARGS with regard to the dc program.

(cherry picked from commit 9a995fe186257315e7b3d01e24c55d86bb18fd32)

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        release/release.sh (unresolved)
        sys/kern/kern_jail.c (unresolved)

Upgrade to version 3.3.0

This update changes the behavior of "-e" or "-f" in BC_ENV_ARGS:

Use of these options on the command line makes bc exit after executing
the given commands. These options will not cause bc to exit when
passed via the environment (but EOF in STDIN or -e or -f on the
command line will make bc exit as before).

The same applies to DC_ENV_ARGS with regard to the dc program.

Vendor import of Gavin Howard's bc version 3.2.6

(cherry picked from commit 47a52dc4d48f259ab7d9f9ba6b65f4f2331a22dc)

Second attempt after revert of a previous commit that affected files
with similar names in unrelated directories.

Thanks go to Martin Birgmaier for reporting the issue and identifying
the cause of git getting confused: files from the root of the vendor
files were associated with files in the FreeBSD base root directory.

Martin Birgmaier points out that to make this cherry-pick succeed,
the option -Xsubtree=contrib/bc has to be passed to prevent files
outside that path to be considered.

Revert "bc: Vendor import of Gavin Howard's bc version 3.2.6"

This reverts commit 601ac82194693fcae9d7d2a7ec7d66ebaf3fd61e.

Seems that git cherry-pick mis-merges files for this software.
It associates files in completely unrelated sub-trees with same name
files from this package, e.g. README.md and .gitignore.

My attempt to fix the mis-merge was incomplete and wrong.
Therefore I'm reverting the commit that as a result of my failed
attempt at conflict resolution lead to README.md and .gitignore
in the top source directory to be deleted.

This mistake has been carried over to releng/13.0, which now
also lacks README.md and .gitignore in /usr/src.

I'll try to re-apply the failed commit over the next hours and to get
the fix merged to releng/13.0 with re approval.

Merge remote-tracking branch 'origin/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        .gitignore (kept)

bc: Vendor import of Gavin Howard's bc version 3.2.6

(cherry picked from commit 47a52dc4d48f259ab7d9f9ba6b65f4f2331a22dc)

Merge branch 'freebsd/current/main' into hardened/current/master

* freebsd/current/main:
  sctp: improve input validation
  mips: fix early kernel panic when setting up interrupt counters
  libc: fix buffer overrun in getrpcport(3)
  msdosfs: fix vnode leak with msdosfs_rename()
  msdosfs: fix double unlock if the source file disappears
  Vendor import of Gavin Howard's bc version 3.2.6
  cxgb(4): Remove assumption of physically contiguous mbufs.
  Import bc 3.2.4

Merge commit '47a52dc4d48f259ab7d9f9ba6b65f4f2331a22dc'

Update to version 3.2.6

MFC after:      3 days