vallumd: backport upstream patch to fix buildbot

Backport upstream patch that bumps minimum required CMake version to fix
buildbot.

Signed-off-by: Stijn Tintel <[email protected]>

i2c-tools: fix Backend 'setuptools.build_meta:__legacy__'

added PKG_BUILD_DEPENDS:=python-setuptools/host to Makefile

Fixes: https://github.com/openwrt/packages/issues/27843
Signed-off-by: Rudy Andram <[email protected]>

libftdi: drop package

libftdi was used only by telldus-core and the old libftdi 0.x version
hasn't been updated from 10 years.

telldus-core works correctly with libftdi1 with a trivial patch.

Drop the package for good instead of fixing it for CMake >= 4.0
compatibility.

Signed-off-by: Christian Marangi <[email protected]>

liburcu: update to version 0.15.5

software version update

Signed-off-by: Jan Hák <[email protected]>

oqs-provider: fix recursive dependency

Fix the following error:
tmp/.config-package.in:54327:error: recursive dependency detected!
tmp/.config-package.in:54327: symbol PACKAGE_libopenssl is selected by PACKAGE_liboqs
tmp/.config-package.in:60997: symbol PACKAGE_liboqs is selected by PACKAGE_libopenssl-oqsprovider
tmp/.config-package.in:54447: symbol PACKAGE_libopenssl-oqsprovider depends on PACKAGE_libopenssl

by reorganizing the dependency list for oqs-provider.

Signed-off-by: Christian Marangi <[email protected]>

telldus-core: fix support for CMake >= 4.0 and move to libftdi1

Add 2 trivial patch to fix support for CMake 4.0 version and use
libftdi1 library instead of the old libftdi 0.x library.

It's safe to use the new library version as the package already expect
it to be used but somehow the CMakeFiles were never updated to actually
use libftdi1 instead of libftdi.

Signed-off-by: Christian Marangi <[email protected]>

oqs-provider: add CI test

This runs a couple of openssl commands to verify that the provider is
loading and generate a private key, without any output checks.

Signed-off-by: Eneas U de Queiroz <[email protected]>
[ use APK and improve commit title ]
Signed-off-by: Christian Marangi <[email protected]>

oqs-provider: add quantum-safe cryptography (QSC) provider

Add libopenssl provider of quantum-safe cryptography (QSC) library.

Tested-by: Eneas U de Queiroz <[email protected]>
Signed-off-by: Christian Marangi <[email protected]>

liboqs: Add library for quantum-safe cryptographic algorithms

liboqs is an open source C library for quantum-safe cryptographic
algorithms.

liboqs provides:

- a collection of open source implementations of quantum-safe key
  encapsulation mechanisms (KEMs) and digital signature algorithms
- a common API for these algorithms
- a test harness and benchmarking routines

liboqs is part of the Open Quantum Safe (OQS) project, which aims to
develop and integrate into applications quantum-safe cryptography to
facilitate deployment and testing in real world contexts. In particular,
OQS provides prototype integrations of liboqs into protocols like TLS,
X.509, and S/MIME, through our OpenSSL 3 Provider and we provide a
variety of other post-quantum-enabled demos.

Signed-off-by: Christian Marangi <[email protected]>
Tested-by: Eneas U de Queiroz <[email protected]>

go2rtc: update to 1.9.12

- Update version to 1.9.12
- Rebase and refresh patchset (no changes)

Signed-off-by: Vladimir Ermakov <[email protected]>

lua-eco: update to 3.14.0

A new module `net` added since this version.

changelog: https://github.com/zhaojh329/lua-eco/releases/tag/v3.14.0

Signed-off-by: Jianhui Zhao <[email protected]>

mstflint: update to 4.34.0-2

This commit updates the mstflint package
to the latest 4.34.0-2 release.

Additionally, introduce PKG_SUBVERSION
to handle upstream subversioned releases.

Signed-off-by: Til Kaiser <[email protected]>

telegraf: update to 1.36.4

- Update Telegraf to v1.36.4

Signed-off-by: Niklas Thorild <[email protected]>

realtek-poe: increase version to v1.3.1

This enables cmake 3.10, and allows realtek-poe to be built again.

Signed-off-by: Martin Kennedy <[email protected]>

python-pynacl: fix typo in PKG_BUILD_DEPENDS

Fixes
   https://github.com/openwrt/packages/pull/27863/commits/0c11fe96b000583b50565b1788cde6fb56131b62

Signed-off-by: Alexandru Ardelean <[email protected]>

lua: move Lua packages under lang/lua sub-folder

There are roughly 50 Lua packages.
It's about time we consider a proposal for moving all of them
under a lang/lua sub-folder.

Signed-off-by: Alexandru Ardelean <[email protected]>

owut: update to 2025.11.16

Enhancements:
    efahl/owut@af42b8afe35c owut: minor improvement on logging API
    efahl/owut@223d6e64b719 owut: add 'clean slate' option to reset to default packages
    efahl/owut@3a35acb7a09a owut: typos and wording fixes
    efahl/owut@eba5101ba780 owut: report counts of failed package builds
    efahl/owut@365eed1f26c2 owut: use library glob

Signed-off-by: Eric Fahlgren <[email protected]>

adblock: release 4.4.3-1
* support TLDs in feeds and local block-/allowlist, e.g. to block all 'de' domains with a single entry
* add active feed domains (of the feed download URLs) automatically to the local allowlist, to prevent download erros
* update the feed categories of 1hosts
* update and change the feed categories of hagezi: new categories are 'abusetlds',  'social', 'urlshortener' and
  'nrd' (newly registered domains). The latter one required download URL changes.
  Please note: if you use hagezi than remove and re-add the categories in LuCI feed selection after the updae
* Add an external adblock test (https://adblock.turtlecute.org/) on the DNS reporting tab, itprovides a simple
  way to check whether your current adblock setup is working as expected
* readme update

Signed-off-by: Dirk Brenken <[email protected]>

yq: Update to 4.48.2

Signed-off-by: Tianling Shen <[email protected]>

python-hatch-vcs: upgrade to version 0.5.0

Upgrade to version 0.5.0
Add python-setuptools/host as dep.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-greenlet: upgrade to version 3.2.4

This upgrades greenlet to 3.2.4

Signed-off-by: Alexandru Ardelean <[email protected]>

python-markdown: upgrade to version 3.10

This change updates markdown to version 3.10

Signed-off-by: Alexandru Ardelean <[email protected]>

python-eventlet: bump to version 0.40.3

This change updates eventlet to 0.40.3
It no longer needs 'six'
Needs python-setuptools/host & python-hatchling/host &
python-hatch-vcs/host as PKG_BUILD_DEPENDS.

Signed-off-by: Alexandru Ardelean <[email protected]>

mjpg-streamer: add cmake 4.x compatibility

Project is abandoned, add a DIY patch.

Signed-off-by: George Sapkin <[email protected]>

czmq: remove absent maintainer

Remove inactive maintainer.

Signed-off-by: Tianling Shen <[email protected]>

czmq: add cmake 4.x compatibility

Upstream backport.

Signed-off-by: Tianling Shen <[email protected]>

zlog: remove absent maintainer

Remove inactive maintainer.

Signed-off-by: Tianling Shen <[email protected]>

zlog: add cmake 4.x compatibility

Upstream backport.

Signed-off-by: Tianling Shen <[email protected]>

luv: Update to 1.51.0-1

Changelog:
- https://github.com/luvit/luv/releases/tag/1.41.0-0
- https://github.com/luvit/luv/releases/tag/1.41.1-0
- https://github.com/luvit/luv/releases/tag/1.42.0-0
- https://github.com/luvit/luv/releases/tag/1.42.0-1
- https://github.com/luvit/luv/releases/tag/1.43.0-0
- https://github.com/luvit/luv/releases/tag/1.44.2-0
- https://github.com/luvit/luv/releases/tag/1.44.2-1
- https://github.com/luvit/luv/releases/tag/1.45.0-0
- https://github.com/luvit/luv/releases/tag/1.46.0-0
- https://github.com/luvit/luv/releases/tag/1.47.0-0
- https://github.com/luvit/luv/releases/tag/v1.48.0-0
- https://github.com/luvit/luv/releases/tag/1.48.0-1
- https://github.com/luvit/luv/releases/tag/v1.50.0-0
- https://github.com/luvit/luv/releases/tag/1.50.0-1
- https://github.com/luvit/luv/releases/tag/1.51.0-0
- https://github.com/luvit/luv/releases/tag/1.51.0-1

Signed-off-by: Tianling Shen <[email protected]>

isc-dhcp: Missing trailing dot on SRV RRs

When generating SRV RRs we're omitting the trailing dot that
roots the domain.

Signed-off-by: Philip Prindeville <[email protected]>

zmq: add cmake 4.x compatibility

Add upstream patches.

Signed-off-by: George Sapkin <[email protected]>

msmtp: update to version 1.8.32

Release notes:
https://marlam.de/msmtp/news/msmtp-1-8-32/

Signed-off-by: Josef Schlehofer <[email protected]>

iperf3: update to 3.20

Update to latest upstream release.

Changelog: https://github.com/esnet/iperf/releases/tag/3.20

Build system: x86/64
Build-tested: x86/64-glibc
Run-tested: x86/64-glibc

Signed-off-by: John Audia <[email protected]>

travelmate: update 2.2.1-6

- rework the iw device detection in the scan function
- remove any limits from the radio selection
- control the reverse radio processing order with a separate option 'trm_revradio'
- tweak a few (debug) log statements
- LuCI updates (separate commit)
- readme update

Signed-off-by: Dirk Brenken <[email protected]>

ecdsautils: add cmake 4.x compatibility

Upstream backport.

Signed-off-by: Tianling Shen <[email protected]>

yt-dlp: bump to 2025.11.12

An external JavaScript runtime (e.g. QuickJS) is now required for full
YouTube support.

Add QuickJS as a dependency and use it as an external runtime.

Move cache to /var/cache.

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.11.12
Signed-off-by: George Sapkin <[email protected]>

gost_engine: fix and improve CI test

The test script was still using opkg to install openssl-util.  Use apk
instead, and move it to pre-test.sh so that openssl installation will
not depend on the order that the packages are tested.

Signed-off-by: Eneas U de Queiroz <[email protected]>

afalg_engine: CI: use apk

Use apk to install openssl-util in the package's test.sh.

Signed-off-by: Eneas U de Queiroz <[email protected]>

uci2: Update to 2.0.0

Simplify Makefile while at it.

Signed-off-by: Tianling Shen <[email protected]>

python-docker: fix pyproject.toml issues

* Getting build dependencies for wheel...

ERROR Missing dependencies:
   hatch-vcs

File "./staging_dir/hostpkg/lib/python3.11/site-packages/setuptools/config/pyprojecttoml.py", line 51, in validate
raise ValueError(f"{error}\n{summary}") from None
ValueError: invalid pyproject.toml config: `project.license`.
configuration error: `project.license` must be valid exactly by one definition (2 matches found):

- keys:
    'file': {type: string}
  required: ['file']
- keys:
    'text': {type: string}
  required: ['text']

Signed-off-by: Javier Marcet <[email protected]>

python-docker: Update to 7.1.0

Release notes: https://github.com/docker/docker-py/releases/tag/7.1.0

Signed-off-by: Javier Marcet <[email protected]>

python-ruamel-yaml: update to version 0.18.16

Release notes can be found here:
https://yaml.dev/doc/ruamel-yaml/

Wheel is compiled as ruamel_yaml (underscore), but on pypi it is ruamel.yaml (dot),
it failed on buildbot, so add slight tweak.

Signed-off-by: Josef Schlehofer <[email protected]>

python-yaml: update to version 6.0.3

Release notes:
https://github.com/yaml/pyyaml/releases/tag/6.0.3

Signed-off-by: Josef Schlehofer <[email protected]>

python-flask-socketio: update to version 5.5.1

Release notes:
https://github.com/miguelgrinberg/Flask-SocketIO/releases/tag/v5.5.1

Signed-off-by: Josef Schlehofer <[email protected]>

python-flask-session: update to version 0.8.0

Release notes:
https://flask-session.readthedocs.io/en/latest/changes.html

Signed-off-by: Josef Schlehofer <[email protected]>

python-flask-seasurf: update to 2.0.0

Changes can be found here:
https://github.com/maxcountryman/flask-seasurf/tree/2.0.0

Signed-off-by: Josef Schlehofer <[email protected]>

python-flask-login: update to version 0.6.3

Release notes:
https://github.com/maxcountryman/flask-login/releases/tag/0.6.3

Signed-off-by: Josef Schlehofer <[email protected]>

Flask: update to version 3.1.2

Release notes:
https://github.com/pallets/flask/releases/tag/3.1.2

Signed-off-by: Josef Schlehofer <[email protected]>

python-werkzeug: update to version 3.1.3

Release notes:
https://github.com/pallets/werkzeug/releases/tag/3.1.3

Signed-off-by: Josef Schlehofer <[email protected]>

python-jinja2: update to version 3.1.6

Release notes:
https://github.com/pallets/jinja/releases/tag/3.1.6

Signed-off-by: Josef Schlehofer <[email protected]>
(cherry picked from commit 0b819479744808da38a35c71f0dcfbb33b4cc06f)

python-markupsafe: add python-setuptools/host as build dep for targer package

Required now since python3/host no longer provides setuptools bundled.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-babel: upgrade to version 2.17.0

Need to also provide python-setuptools/host as build dep for
host and target build.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-pynacl: upgrade to version 1.6.1

Drop 'six' requirement (no longer needed).
python-setuptools/host needed for build.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-hatchling: add python-setuptools/host as dep

Previously this was provided by python3/host

Signed-off-by: Alexandru Ardelean <[email protected]>

quickjs: add new package

QuickJS is a small and embeddable JavaScript engine. It supports the
ES2023 specification including modules, asynchronous generators, proxies
and BigInt.

Signed-off-by: George Sapkin <[email protected]>

openelp: Update to 0.9.3

Changelog: https://github.com/cottsay/openelp/compare/v0.9.2...v0.9.3

Signed-off-by: Tianling Shen <[email protected]>

nano: update to version 8.7

Update to version 8.7

Signed-off-by: Hannu Nyman <[email protected]>

tor: add myself as package maintainer

Also remove Peter Wagner (inactive) and Hauke Mehrtens (asked to be removed, in
private conversation).

Signed-off-by: Rui Salvaterra <[email protected]>

tor: update to 0.4.8.20 stable

Minor release, see the changelog [1] for what's new.

[1] https://gitlab.torproject.org/tpo/core/tor/-/blob/tor-0.4.8.20/ChangeLog

Signed-off-by: Rui Salvaterra <[email protected]>

mbpoll: add cmake 4.x compatibility

Upstream backport.

Signed-off-by: Tianling Shen <[email protected]>

python-calver: add python-setuptools/host as dep to HostBuild

Required now, since python-setuptools/host is separate from python3

Signed-off-by: Alexandru Ardelean <[email protected]>

python-setuptools-scm: bump to version 9.2.2

And add python-setuptools/host as dependency.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-automat: bump to version 25.4.16

Patches can be dropped.
They don't seem to be needed anymore.
The 'visualize' parts seem to be optional.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-toml: fix build dependency on python-setuptools

Fix #27855

Signed-off-by: Vladimir Ermakov <[email protected]>

libyang: add dependency on libxxhash

Fix #27856

Signed-off-by: Vladimir Ermakov <[email protected]>

mdio-tools: backport segfault fix

Return an ENOMEM error when the buffer is too small to perform the operation.

Before:
$ mdio mt7530-0 0x05:31 dump 0x0+512
Segmentation fault

After:
$ mdio mt7530-0 0x05:31 dump 0x0+512
ERROR: Dump operation failed (-12)

Signed-off-by: Aleksander Jan Bajkowski <[email protected]>

python-cffi: bump to version 2.0.0

Bump to version 2.0.0 because the CI seems to also include this.
Drop patch for un-pinning setuptools.

Signed-off-by: Alexandru Ardelean <[email protected]>

python3: remove lib2to3 dep from 'python3-package-dev'

lib2to3 no longer exists.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-setuptools: fix host deps

setuptools does not require that many deps.
This also fixes some circular dependencies.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-markupsafe: add python-setuptools/host to HostBuild dep

Required, since python3 no longer installs this for the host-build.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-pyproject-hooks: bump to version 1.2.0

Since python3 no longer provides setuptools host-side, we need
to provide it as an explicit dependency.
Removing 'wheel' since it's not a dep of pyproject-hooks.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-semantic-version: add python-setuptools/host dep to HostBuild

This is needed now, since python3/host no longer installs setuptools
host-side.

Signed-off-by: Alexandru Ardelean <[email protected]>

python-ply: add python-setuptools/host dep to HostBuild & pkg build

This is needed now, since python3/host no longer installs setuptools
host-side.

Signed-off-by: Alexandru Ardelean <[email protected]>

pymysql: bump to version 1.1.2

Also fixes error with wheel file name.

Signed-off-by: Alexandru Ardelean <[email protected]>

pyproject-metadata: bump to 0.9.1 & add python-setuptools/host dep for HostBuild

Required now that python3 doesn't provide setuptools during the hostpkg
installation.

Signed-off-by: Alexandru Ardelean <[email protected]>

canutils: Update to 2025.01

Update build targets and backport an upstream fix for missing header.

Changelog: https://github.com/linux-can/can-utils/releases/tag/v2025.01

Signed-off-by: Tianling Shen <[email protected]>

cereal: Update to 1.3.2

Disable build for useless docs.

Changelog:
- https://github.com/USCiLab/cereal/releases/tag/v1.3.1
- https://github.com/USCiLab/cereal/releases/tag/v1.3.2

Signed-off-by: Tianling Shen <[email protected]>

cshark: drop package

requires newer cmake to compile, but the company behind this has pivoted and no
longer actively supports this, and are phasing it out.

This package is rather pointless anyway, since you can just use the sshdump
remote capture plugin in Wireshark with tcpdump on your router and see live
results, far superior to this.

Signed-off-by: Paul Donald <[email protected]>

nmap: add build depedency on python-setuptools (fixes #27833)

python-setuptools no longer comes by default with the python package,
so we must depend on it explicitly

Signed-off-by: Nuno Gonçalves <[email protected]>

frr: update to 10.4.1

switch to release codeload version
fix startup error messages

Signed-off-by: Lucian CRISTIAN <[email protected]>

softethervpn5: disable OQS module

The OQS module was enabled by default in 5.02.5186 with a massive size
increase. The OQS gets built-in and it's for support of Post Quantum
chiper.

Disable it by default to reduce the total size of the package.

If needed they will can be enabled again by compiling the
libopenssl-oqsprovider package that enable the OpenSSL provider for
these additional chiper.

Signed-off-by: Christian Marangi <[email protected]>

softethervpn5: bump to version 5.2.5188

Bump softethervpn5 to version 5.2.5188 to fix support for CMake >= 4.0

Patch automatically refreshed.

Signed-off-by: Christian Marangi <[email protected]>

less: bump to 685

Remove maintainer.
Update copyright date.

Changelog: https://greenwoodsoftware.com/less/news.663.html
Changelog: https://greenwoodsoftware.com/less/news.665.html
Changelog: https://greenwoodsoftware.com/less/news.666.html
Changelog: https://greenwoodsoftware.com/less/news.667.html
Changelog: https://greenwoodsoftware.com/less/news.668.html
Changelog: https://greenwoodsoftware.com/less/news.674.html
Changelog: https://greenwoodsoftware.com/less/news.676.html
Changelog: https://greenwoodsoftware.com/less/news.678.html
Changelog: https://greenwoodsoftware.com/less/news.679.html
Changelog: https://greenwoodsoftware.com/less/news.683.html
Changelog: https://greenwoodsoftware.com/less/news.684.html
Changelog: https://greenwoodsoftware.com/less/news.685.html
Signed-off-by: George Sapkin <[email protected]>

less: add CI test script

Add a simple version check to ensure the compiled binary installs and
runs.

Signed-off-by: George Sapkin <[email protected]>

libuhttpd: backport upstream CMake patch

Backport upstream CMake patch to fix compilation error to support
CMake version >= 4.0.

Fixes: #27835
Signed-off-by: Christian Marangi <[email protected]>

go2rtc: update to 1.9.11

- Update version
- Remove unneded patches
- Add patch to drop codegen in alsa module
- Rebase & refresh patches

Signed-off-by: Vladimir Ermakov <[email protected]>

go2rtc: jail service, add uci config

- Add UCI configuration to be able to switch user/group and set ulimit.
- Place daemon into jail by default, to allow bind on lower ports, such as 554 (RTSP)
- Add option to allow or deny config.yaml editing from the web interface.
- Connect stdout/err to log

Signed-off-by: Vladimir Ermakov <[email protected]>

libyang: update to 3.13.6

update to latest version to fix Cmake issues

Signed-off-by: Lucian CRISTIAN <[email protected]>

perl-ack: Update to 3.9.0

v3.9.0      Mon May 26 15:02:57 CDT 2025
========================================
The --not option can be used with either --and or --or.

The -g option can now use any of the boolean options, --and, --or or --not.

[FIXES]
When using --output='$f', the filename would be colorized in the output
line, but should not have been.  This has been fixed. Thanks, Dabrien
'Dabe' Murphy. (GH #350)

Signed-off-by: Tianling Shen <[email protected]>

msgpack-c: Update to 6.1.0

Changelog:
- https://github.com/msgpack/msgpack-c/releases/tag/c-6.0.1
- https://github.com/msgpack/msgpack-c/releases/tag/c-6.0.2
- https://github.com/msgpack/msgpack-c/releases/tag/c-6.1.0

Signed-off-by: Tianling Shen <[email protected]>

yajl: add pending patch to handle CMake 4.0 support

Add 2 pending patch to handle CMake 4.0 support. One comes from an open
PR in the project [1]. The other is a downstream fix for trivial CMake
warning.

[1] https://github.com/lloyd/yajl/pull/256

Signed-off-by: Christian Marangi <[email protected]>

icu: bump to 78.1

Update to 78.1

ICU 78 updates to Unicode 17 (blog), including new characters and scripts, emoji, collation & IDNA changes, and corresponding APIs and implementations.

It also updates to CLDR 48 (blog) locale data with new locales, and various additions and corrections.

In C++, there is a new set of APIs for Unicode string (UTF-8/16/32) code point iteration that works seamlessly with modern C++ iterators and ranges.

The C++ implementation of MessageFormat 2.0 is at CLDR 47 level and remains in technology preview.

ICU 78 and CLDR 48 are major releases, including a new version of Unicode and major locale data improvements.

Signed-off-by: Hirokazu MORIKAWA <[email protected]>

yajl: add host build

This patch adds the necessary host build infrastructure for yajl.

While OpenWrt doesn't strictly need this right now, merging this change
prevents downstream projects (like prplOS) from having to fork the package
just to build their host tools, thus keeping the code bases closer.

Signed-off-by: Cedric CHEDALEUX <[email protected]>

libcap-ng: add host build

This patch adds the necessary host build infrastructure for libcap-ng.

While OpenWrt doesn't strictly need this right now, merging this change
prevents downstream projects (like prplOS) from having to fork the package
just to build their host tools, thus keeping the code bases closer.

Signed-off-by: Cedric CHEDALEUX <[email protected]>

librespeed-cli: fix speedtest when server not available

If the server is down it can still be selected to test on it. This fixes
the bug.

See:
- https://github.com/librespeed/speedtest-cli/pull/94

Signed-off-by: Richard Muzik <[email protected]>

librespeed-cli: update to version 1.0.12

For full changelog see:
- https://github.com/librespeed/speedtest-cli/releases

Signed-off-by: Richard Muzik <[email protected]>

v2raya: Update to 2.2.7.4

Release note: https://github.com/v2rayA/v2rayA/releases/tag/v2.2.7.4

Signed-off-by: Tianling Shen <[email protected]>

openlist: Update to 4.1.7

Release note: https://github.com/OpenListTeam/OpenList/releases/tag/v4.1.7

Signed-off-by: Tianling Shen <[email protected]>

netbird: update to 0.59.12

changelog: https://github.com/netbirdio/netbird/releases/tag/v0.59.12

Signed-off-by: Wesley Gimenes <[email protected]>

strongswan: Update to 6.0.3

No significant functional changes.

Signed-off-by: Philip Prindeville <[email protected]>