diff --git a/src/Makefile.com b/src/Makefile.com index f8bc10834..3b0c13f26 100644 --- a/src/Makefile.com +++ b/src/Makefile.com @@ -28,7 +28,7 @@ ROOTBRAND = $(ROOTUSRLIB)/brand ROOTPKGLIB = $(ROOTUSRLIB)/pkg TRIPLET = x86_64-pc-solaris2 -CC = /usr/bin/gcc-14 +CC = /usr/bin/gcc-15 CFLAGS_i386 = -m64 CFLAGS_aarch64 = CFLAGS = $(CFLAGS_$(MACH)) -Wall -Werror -Wextra -gdwarf-2 -gstrict-dwarf \ diff --git a/src/brand/bhyve/requirements.txt b/src/brand/bhyve/requirements.txt index c891bbf5e..216974380 100644 --- a/src/brand/bhyve/requirements.txt +++ b/src/brand/bhyve/requirements.txt @@ -1,8 +1,9 @@ # # This file was automatically produced by tools/updatereqs -# Generated on Sun Dec 29 15:47:15 UTC 2024 +# Generated on Wed Mar 18 12:59:04 UTC 2026 # Do not edit directly # construct==2.10.70 -PyYAML==6.0.2 -wheel==0.45.1 +packaging==26.0 +PyYAML==6.0.3 +wheel==0.46.3 diff --git a/src/client.py b/src/client.py index 039ebeb2e..6dbcd35ee 100755 --- a/src/client.py +++ b/src/client.py @@ -145,7 +145,7 @@ def altbe(): import pkg.client.transport.transport as transport import pkg.client.options as options import pkg.fmri as fmri - import pkg.json as json + import pkg.json_wrapper as json import pkg.misc as misc import pkg.pipeutils as pipeutils import pkg.portable as portable diff --git a/src/depot-config.py b/src/depot-config.py index 75cbabe4f..d43f13035 100755 --- a/src/depot-config.py +++ b/src/depot-config.py @@ -54,7 +54,7 @@ import pkg.client.api_errors as apx import pkg.catalog import pkg.config as cfg - import pkg.json as json + import pkg.json_wrapper as json import pkg.misc as misc import pkg.portable as portable import pkg.p5i as p5i diff --git a/src/modules/catalog.py b/src/modules/catalog.py index b71295de8..4dcb3cecf 100644 --- a/src/modules/catalog.py +++ b/src/modules/catalog.py @@ -43,7 +43,7 @@ import pkg.client.api_errors as api_errors import pkg.client.pkgdefs as pkgdefs import pkg.fmri as fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.misc as misc import pkg.portable as portable import pkg.version diff --git a/src/modules/client/api.py b/src/modules/client/api.py index 121b9c716..7b674f225 100644 --- a/src/modules/client/api.py +++ b/src/modules/client/api.py @@ -86,7 +86,7 @@ import pkg.client.publisher as publisher import pkg.client.query_parser as query_p import pkg.fmri as fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.mediator as med import pkg.misc as misc import pkg.nrlock diff --git a/src/modules/client/client_api.py b/src/modules/client/client_api.py index 29575999a..c706e0e7f 100644 --- a/src/modules/client/client_api.py +++ b/src/modules/client/client_api.py @@ -45,7 +45,7 @@ import pkg.client.publisher as publisher import pkg.client.options as options import pkg.fmri as fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.misc as misc import pkg.version as version diff --git a/src/modules/client/image.py b/src/modules/client/image.py index 65c605f9d..627060fe5 100644 --- a/src/modules/client/image.py +++ b/src/modules/client/image.py @@ -59,7 +59,7 @@ import pkg.config as cfg import pkg.file_layout.layout as fl import pkg.fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.lockfile as lockfile import pkg.manifest as manifest import pkg.mediator as med diff --git a/src/modules/client/linkedimage/common.py b/src/modules/client/linkedimage/common.py index 3dfe541d0..eba38012a 100644 --- a/src/modules/client/linkedimage/common.py +++ b/src/modules/client/linkedimage/common.py @@ -64,7 +64,7 @@ import pkg.client.progress as progress import pkg.facet import pkg.fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.misc as misc import pkg.version diff --git a/src/modules/client/plandesc.py b/src/modules/client/plandesc.py index 3ed3f036f..25e3631a4 100644 --- a/src/modules/client/plandesc.py +++ b/src/modules/client/plandesc.py @@ -50,7 +50,7 @@ import pkg.client.pkgplan import pkg.facet import pkg.fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.misc import pkg.version diff --git a/src/modules/client/progress.py b/src/modules/client/progress.py index c4cd77f25..a2038e0ef 100644 --- a/src/modules/client/progress.py +++ b/src/modules/client/progress.py @@ -41,7 +41,7 @@ import pkg.client.pkgdefs as pkgdefs import pkg.client.publisher as publisher import pkg.fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.misc as misc from pkg.client import global_settings diff --git a/src/modules/client/transport/repo.py b/src/modules/client/transport/repo.py index b861f36db..f2da66819 100644 --- a/src/modules/client/transport/repo.py +++ b/src/modules/client/transport/repo.py @@ -50,7 +50,7 @@ import pkg.client.api_errors as apx import pkg.client.transport.exception as tx import pkg.config as cfg -import pkg.json as json +import pkg.json_wrapper as json import pkg.p5p import pkg.server.repository as svr_repo import pkg.server.query_parser as sqp diff --git a/src/modules/client/transport/transport.py b/src/modules/client/transport/transport.py index 99cd57053..6e656ac9c 100644 --- a/src/modules/client/transport/transport.py +++ b/src/modules/client/transport/transport.py @@ -58,7 +58,7 @@ import pkg.digest as digest import pkg.file_layout.file_manager as fm import pkg.fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.manifest as manifest import pkg.misc as misc import pkg.nrlock as nrlock diff --git a/src/modules/json.py b/src/modules/json_wrapper.py similarity index 100% rename from src/modules/json.py rename to src/modules/json_wrapper.py diff --git a/src/modules/misc.py b/src/modules/misc.py index 78b90a983..e7a346655 100644 --- a/src/modules/misc.py +++ b/src/modules/misc.py @@ -86,7 +86,7 @@ from urllib.request import pathname2url, url2pathname import pkg.client.api_errors as api_errors -import pkg.json as json +import pkg.json_wrapper as json import pkg.portable as portable import pkg.digest as digest diff --git a/src/modules/p5i.py b/src/modules/p5i.py index 59343f9e1..61b5092ff 100644 --- a/src/modules/p5i.py +++ b/src/modules/p5i.py @@ -33,7 +33,7 @@ import pkg.client.api_errors as api_errors import pkg.client.publisher as publisher -import pkg.json as json +import pkg.json_wrapper as json import pkg.fmri as fmri CURRENT_VERSION = 1 diff --git a/src/modules/p5s.py b/src/modules/p5s.py index 8ce62a3b2..58058fcf2 100644 --- a/src/modules/p5s.py +++ b/src/modules/p5s.py @@ -30,7 +30,7 @@ import pkg.client.api_errors as api_errors import pkg.client.publisher as publisher -import pkg.json as json +import pkg.json_wrapper as json import pkg.digest as digest from pkg.client.imageconfig import DEF_TOKEN from pkg.misc import force_bytes diff --git a/src/modules/server/depot.py b/src/modules/server/depot.py index 5323b38bd..b30136404 100644 --- a/src/modules/server/depot.py +++ b/src/modules/server/depot.py @@ -71,7 +71,7 @@ import pkg.actions as actions import pkg.config as cfg import pkg.fmri as fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.indexer as indexer import pkg.manifest as manifest import pkg.misc as misc diff --git a/src/modules/solver/solver.c b/src/modules/solver/solver.c index 78a2d3510..10dd5c17c 100644 --- a/src/modules/solver/solver.c +++ b/src/modules/solver/solver.c @@ -21,6 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include #include +#include #include #include "solver.h" @@ -83,8 +84,8 @@ struct clause_t static inline int clause_size (clause* c) { return c->size_learnt >> 1; } static inline lit* clause_begin (clause* c) { return c->lits; } static inline int clause_learnt (clause* c) { return c->size_learnt & 1; } -static inline float clause_activity (clause* c) { return *((float*)&c->lits[c->size_learnt>>1]); } -static inline void clause_setactivity(clause* c, float a) { *((float*)&c->lits[c->size_learnt>>1]) = a; } +static inline float clause_activity (clause* c) { float a; memcpy(&a, &c->lits[c->size_learnt>>1], sizeof(a)); return a; } +static inline void clause_setactivity(clause* c, float a) { memcpy(&c->lits[c->size_learnt>>1], &a, sizeof(a)); } static inline int clause_bytesize (clause *c) { return clause_size(c) * sizeof (lit) + @@ -296,8 +297,10 @@ static clause* clause_new(solver* s, lit* begin, lit* end, int learnt) for (i = 0; i < size; i++) c->lits[i] = begin[i]; - if (learnt) - *((float*)&c->lits[size]) = 0.0; + if (learnt) { + float zero = 0.0f; + memcpy(&c->lits[size], &zero, sizeof(zero)); + } assert(begin[0] >= 0); assert(begin[0] < s->size*2); diff --git a/src/modules/solver/solver.h b/src/modules/solver/solver.h index eda4ac96f..3639d23b9 100644 --- a/src/modules/solver/solver.h +++ b/src/modules/solver/solver.h @@ -31,11 +31,6 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA //================================================================================================= // Simple types: -// does not work for c++ -typedef int bool; -static const bool true = 1; -static const bool false = 0; - typedef int lit; typedef char lbool; diff --git a/src/pkg/manifests/package:pkg.p5m b/src/pkg/manifests/package:pkg.p5m index 145f66adf..b1d8bf5eb 100644 --- a/src/pkg/manifests/package:pkg.p5m +++ b/src/pkg/manifests/package:pkg.p5m @@ -139,7 +139,7 @@ file path=$(PYDIRVP)/pkg/flavor/script.py file path=$(PYDIRVP)/pkg/flavor/smf_manifest.py file path=$(PYDIRVP)/pkg/fmri.py file path=$(PYDIRVP)/pkg/indexer.py -file path=$(PYDIRVP)/pkg/json.py +file path=$(PYDIRVP)/pkg/json_wrapper.py dir path=$(PYDIRVP)/pkg/lint file path=$(PYDIRVP)/pkg/lint/__init__.py file path=$(PYDIRVP)/pkg/lint/base.py diff --git a/src/pkgrepo.py b/src/pkgrepo.py index af4d2753b..656fe1117 100755 --- a/src/pkgrepo.py +++ b/src/pkgrepo.py @@ -62,7 +62,7 @@ import pkg.client.publisher as publisher import pkg.client.transport.transport as transport import pkg.fmri as fmri - import pkg.json as json + import pkg.json_wrapper as json import pkg.misc as misc import pkg.server.repository as sr diff --git a/src/requirements.txt b/src/requirements.txt index c165b9dea..aa21405bd 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,26 +1,35 @@ # # This file was automatically produced by tools/updatereqs -# Generated on Mon Sep 8 14:24:53 UTC 2025 +# Generated on Wed Mar 18 12:58:50 UTC 2026 # Do not edit directly # -autocommand==2.2.2 -cheroot==10.0.1 +annotated-doc==0.0.4 +cheroot==11.1.2 CherryPy==18.10.0 +click==8.3.1 jaraco.collections==5.2.1 -jaraco.context==6.0.1 -jaraco.functools==4.3.0 -jaraco.text==4.0.0 +jaraco.context==6.1.1 +jaraco.functools==4.4.0 +jaraco.text==4.2.0 Mako==1.3.10 -MarkupSafe==3.0.2 +markdown-it-py==4.0.0 +MarkupSafe==3.0.3 +mdurl==0.1.2 more-itertools==10.8.0 +packaging==26.0 ply==3.11 portend==3.2.1 -prettytable==3.16.0 +prettytable==3.17.0 pybonjour @ https://mirrors.omnios.org/pymodules/pybonjour/pybonjour-1.1.1-python3.tar.gz#sha256 +Pygments==2.19.2 python-dateutil==2.9.0.post0 -setuptools==80.9.0 +rich==14.3.3 +setuptools==82.0.1 +shellingham==1.5.4 six==1.17.0 tempora==5.8.1 -wcwidth==0.2.13 -wheel==0.45.1 -zc.lockfile==3.0.post1 +typer==0.24.1 +typer-slim==0.24.0 +wcwidth==0.6.0 +wheel==0.46.3 +zc.lockfile==4.0 diff --git a/src/sysrepo.py b/src/sysrepo.py index 51818243e..3ff57d3aa 100755 --- a/src/sysrepo.py +++ b/src/sysrepo.py @@ -55,7 +55,7 @@ import pkg.client.progress as progress import pkg.client.api_errors as apx import pkg.digest as digest - import pkg.json as json + import pkg.json_wrapper as json import pkg.misc as misc import pkg.portable as portable import pkg.p5p as p5p diff --git a/src/tests/api/t_catalog.py b/src/tests/api/t_catalog.py index d82417ace..e65937dfd 100644 --- a/src/tests/api/t_catalog.py +++ b/src/tests/api/t_catalog.py @@ -39,7 +39,7 @@ import pkg.actions import pkg.fmri as fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.catalog as catalog import pkg.client.api_errors as api_errors import pkg.manifest as manifest diff --git a/src/tests/bandit-baseline.json b/src/tests/bandit-baseline.json index 2215b3e4a..2398ad013 100644 --- a/src/tests/bandit-baseline.json +++ b/src/tests/bandit-baseline.json @@ -1302,7 +1302,7 @@ "nosec": 0, "skipped_tests": 0 }, - "./modules/json.py": { + "./modules/json-wrapper.py": { "CONFIDENCE.HIGH": 0, "CONFIDENCE.LOW": 0, "CONFIDENCE.MEDIUM": 0, @@ -6004,4 +6004,4 @@ "test_name": "blacklist" } ] -} \ No newline at end of file +} diff --git a/src/tests/cli/t_client_api.py b/src/tests/cli/t_client_api.py index 43e8173c1..36fa59e79 100644 --- a/src/tests/cli/t_client_api.py +++ b/src/tests/cli/t_client_api.py @@ -34,7 +34,7 @@ import os import pkg.client.client_api as cli_api import pkg.client.progress as progress -import pkg.json as json +import pkg.json_wrapper as json from pkg.client import global_settings diff --git a/src/tests/cli/t_fix.py b/src/tests/cli/t_fix.py index f5777ec14..fadb90ab4 100644 --- a/src/tests/cli/t_fix.py +++ b/src/tests/cli/t_fix.py @@ -39,7 +39,7 @@ import time import unittest -import pkg.json as json +import pkg.json_wrapper as json class TestFix(pkg5unittest.SingleDepotTestCase): diff --git a/src/tests/cli/t_pkg_avoid.py b/src/tests/cli/t_pkg_avoid.py index 5ad98de2e..96f289d52 100644 --- a/src/tests/cli/t_pkg_avoid.py +++ b/src/tests/cli/t_pkg_avoid.py @@ -32,7 +32,7 @@ import pkg5unittest import os -import pkg.json as json +import pkg.json_wrapper as json class TestPkgAvoid(pkg5unittest.SingleDepotTestCase): diff --git a/src/tests/cli/t_pkg_flag.py b/src/tests/cli/t_pkg_flag.py index e7dd28057..6e6403e34 100644 --- a/src/tests/cli/t_pkg_flag.py +++ b/src/tests/cli/t_pkg_flag.py @@ -36,7 +36,7 @@ import time import pkg.client.api_errors as apx -import pkg.json as json +import pkg.json_wrapper as json import pkg.fmri as fmri diff --git a/src/tests/cli/t_pkg_freeze.py b/src/tests/cli/t_pkg_freeze.py index 2d9eec251..9347223ae 100644 --- a/src/tests/cli/t_pkg_freeze.py +++ b/src/tests/cli/t_pkg_freeze.py @@ -36,7 +36,7 @@ import time import pkg.client.api_errors as apx -import pkg.json as json +import pkg.json_wrapper as json import pkg.fmri as fmri diff --git a/src/tests/cli/t_pkg_verify.py b/src/tests/cli/t_pkg_verify.py index 636144140..a4c9f452b 100644 --- a/src/tests/cli/t_pkg_verify.py +++ b/src/tests/cli/t_pkg_verify.py @@ -37,7 +37,7 @@ import time import unittest -import pkg.json as json +import pkg.json_wrapper as json class TestPkgVerify(pkg5unittest.SingleDepotTestCase): diff --git a/src/tests/cli/t_pkgrecv.py b/src/tests/cli/t_pkgrecv.py index fbdf3d33a..4a3cdfc91 100644 --- a/src/tests/cli/t_pkgrecv.py +++ b/src/tests/cli/t_pkgrecv.py @@ -51,7 +51,7 @@ from pkg.actions import fromstr from pkg.digest import DEFAULT_HASH_FUNC -import pkg.json as json +import pkg.json_wrapper as json from urllib.parse import urlparse from urllib.request import url2pathname diff --git a/src/tests/cli/t_pkgrepo.py b/src/tests/cli/t_pkgrepo.py index 57eddd10b..af90e0762 100644 --- a/src/tests/cli/t_pkgrepo.py +++ b/src/tests/cli/t_pkgrepo.py @@ -37,7 +37,7 @@ import pkg.manifest import pkg.depotcontroller as dc import pkg.fmri as fmri -import pkg.json as json +import pkg.json_wrapper as json import pkg.misc as misc import pkg.pkggzip import pkg.server.repository as sr diff --git a/src/tests/cli/t_sysrepo.py b/src/tests/cli/t_sysrepo.py index 67c70a625..46cfd7fda 100644 --- a/src/tests/cli/t_sysrepo.py +++ b/src/tests/cli/t_sysrepo.py @@ -48,7 +48,7 @@ from urllib.parse import urlparse, unquote import pkg.misc as misc -import pkg.json as json +import pkg.json_wrapper as json import pkg.portable as portable from pkg.digest import DEFAULT_HASH_FUNC diff --git a/src/tests/pkg5unittest.py b/src/tests/pkg5unittest.py index 306172cf3..0b1e50ddd 100644 --- a/src/tests/pkg5unittest.py +++ b/src/tests/pkg5unittest.py @@ -77,7 +77,7 @@ from socket import error as socketerror import pkg.client.api_errors as apx -import pkg.json as json +import pkg.json_wrapper as json import pkg.misc as misc import pkg.client.publisher as publisher import pkg.portable as portable diff --git a/src/util/apache2/sysrepo/sysrepo_p5p.py b/src/util/apache2/sysrepo/sysrepo_p5p.py index 3072d081d..e837bfd80 100755 --- a/src/util/apache2/sysrepo/sysrepo_p5p.py +++ b/src/util/apache2/sysrepo/sysrepo_p5p.py @@ -31,7 +31,7 @@ import sys import threading import traceback -import pkg.json as json +import pkg.json_wrapper as json from pkg.misc import force_str # redirecting stdout for proper WSGI portability