Python module updates / build with gcc15

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 \

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

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

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

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

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

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
 

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

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
 

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
 

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

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

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

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
 

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

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

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

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 <stdio.h>
 #include <assert.h>
+#include <string.h>
 #include <math.h>
 
 #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);

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;
 

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

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
 

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

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

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

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"
     }
   ]
-}
+}

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
 

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):

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):

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
 
 

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
 
 

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):

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
 

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

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

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

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