diff --git a/README.md b/README.md index 09b365f0..306a3571 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The above will run all test cases in 8 parallel processes. Other options are als Tests running can also be done by using make: > $cd src; sudo make test -Make targets test-37 and test-39 are available for testing specific Python versions. +Make targets test-39 and test-311 are available for testing specific Python versions. IPS applications and libraries can be packaged and published into an IPS repository using: > $cd src; make packages; @@ -85,7 +85,7 @@ security vulnerability reporting and disclosure process. ## License -Copyright (c) 2010, 2023, Oracle and/or its affiliates. +Copyright (c) 2010, 2024, Oracle and/or its affiliates. The Image Packaging System is primarily distributed under the terms of the CDDL (Common Development and Distribution License), with a few portions covered by BSD-style or MIT-style licenses. diff --git a/src/Makefile b/src/Makefile index 40707ae6..04cc9a2e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -50,7 +50,7 @@ INSTALL = $(STASH) file -v MKDIR = mkdir -p PROTO_AREA:sh = echo $(dirname $(pwd))/proto/root_$(uname -p) -PROTO_VENDOR_PACKAGES = $(PROTO_AREA)/usr/lib/python3.9/vendor-packages +PROTO_VENDOR_PACKAGES = $(PROTO_AREA)/usr/lib/python3.11/vendor-packages RESOURCE_DIR = $(PROTO_AREA)/usr/share/lib/pkg TRANSFORM_DIR = $(PROTO_AREA)/usr/share/pkg/transforms @@ -209,7 +209,7 @@ $(LINT)CLINT = lint CLINT = $(LINT) CLINT_FLAGS = -m64 -u -axms -erroff=E_NAME_DEF_NOT_USED2 -CLINT_INCLUDES = -Imodules -I/usr/include/python3.9 +CLINT_INCLUDES = -Imodules -I/usr/include/python3.11 # Runs lint tools over IPS C extension source code. clint: cffi_src modules @@ -227,18 +227,18 @@ clint: cffi_src modules # pylint: PYTHONPATH=$(PROTO_VENDOR_PACKAGES):tests \ - $(PYTHON39) -m pylint --rcfile tests/pylintrc $(PYLINT_TARGETS) + $(PYTHON311) -m pylint --rcfile tests/pylintrc $(PYLINT_TARGETS) # A note about bandit baselines: bandit will report new errors but it # will not fail on a new duplicate issues (bandit bugs: 466 and 558) bandit: - $(PYTHON39) -m bandit -r -q -c tests/banditrc . -b tests/bandit-baseline.json + $(PYTHON311) -m bandit -r -q -c tests/banditrc . -b tests/bandit-baseline.json # When generating a baseline, if there are warnings/errors # bandit will exit with a value of 1. regen-bandit: - $(PYTHON39) -m bandit -r -q -c tests/banditrc . -o tests/bandit-baseline.json -f json || true + $(PYTHON311) -m bandit -r -q -c tests/banditrc . -o tests/bandit-baseline.json -f json || true check: $(SUBDIRS) $(PYCODESTYLE) --statistics --count `cat tests/pycodestyle-whitelist.txt` diff --git a/src/cffi_src/Makefile b/src/cffi_src/Makefile index 01f07ea5..c7419cbd 100644 --- a/src/cffi_src/Makefile +++ b/src/cffi_src/Makefile @@ -65,7 +65,7 @@ $(LINT)CLINT = lint CLINT = $(LINT) CLINT_FLAGS = -m64 -u -axms -erroff=E_NAME_DEF_NOT_USED2 -CLINT_INCLUDES = -I/usr/include/python3.9 +CLINT_INCLUDES = -I/usr/include/python3.11 clint: all $(CLINT) $(CLINT_FLAGS) $(CLINT_INCLUDES) _arch.c diff --git a/src/client.py b/src/client.py index 151872b9..ab302185 100755 --- a/src/client.py +++ b/src/client.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/depot-config.py b/src/depot-config.py index 0b09aedd..5957c8a7 100755 --- a/src/depot-config.py +++ b/src/depot-config.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/depot.py b/src/depot.py index 6f563d50..56834240 100755 --- a/src/depot.py +++ b/src/depot.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/modules/Makefile b/src/modules/Makefile index db615a5a..984dc3e4 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -116,7 +116,7 @@ $(LINT)CLINT = lint CLINT = $(LINT) CLINT_FLAGS = -m64 -u -axms -erroff=E_NAME_DEF_NOT_USED2 -CLINT_INCLUDES = -I/usr/include/python3.9 -I. +CLINT_INCLUDES = -I/usr/include/python3.11 -I. clint: all $(CLINT) $(CLINT_FLAGS) $(CLINT_INCLUDES) -lelf -lmd elf.c elfextract.c liblist.c diff --git a/src/pkg/Makefile b/src/pkg/Makefile index 6c2840f3..657d40bc 100644 --- a/src/pkg/Makefile +++ b/src/pkg/Makefile @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2010, 2023, Oracle and/or its affiliates. +# Copyright (c) 2010, 2024, Oracle and/or its affiliates. # PKGVERS_BUILTON = 5.11 @@ -97,11 +97,11 @@ PYTHON311 = python3.11 PY311DIR = usr/lib/$(PYTHON311) PY311DIRVP = $(PY311DIR)/vendor-packages -PYDIR = usr/lib/$(PYTHON39) +PYDIR = usr/lib/$(PYTHON311) PYDIRVP = $(PYDIR)/vendor-packages PKGCMDENV = \ PATH=$(PKGROOT)/usr/bin:/usr/sbin:/usr/bin \ - PYTHONPATH=$(PKGROOT)/$(PYDIRVP) $(PYTHON39) $(PKGROOT)/usr/bin/ + PYTHONPATH=$(PKGROOT)/$(PYDIRVP) $(PYTHON311) $(PKGROOT)/usr/bin/ PKG = $(PKGCMDENV)/pkg PKGDEPEND = $(PKGCMDENV)/pkgdepend PKGDIFF = $(PKGCMDENV)/pkgdiff diff --git a/src/pkg/external_deps.txt b/src/pkg/external_deps.txt index eb015409..b4e2ae01 100644 --- a/src/pkg/external_deps.txt +++ b/src/pkg/external_deps.txt @@ -66,6 +66,7 @@ # Only the variant used by pkg(7) utilities is listed here; # this is to avoid unnecessary circular dependencies with ON. pkg:/system/library/python/solaris-core-39 + pkg:/system/library/python/solaris-core-311 pkg:/system/library/security/crypto pkg:/system/library/smf pkg:/system/linker diff --git a/src/pkg/manifests/package:pkg.p5m b/src/pkg/manifests/package:pkg.p5m index 28f41961..ea766cd8 100644 --- a/src/pkg/manifests/package:pkg.p5m +++ b/src/pkg/manifests/package:pkg.p5m @@ -291,7 +291,7 @@ license lic_minisat license="MIT (MiniSAT)" com.oracle.info.baid=17890 \ com.oracle.info.description="MiniSAT 1.14.1" com.oracle.info.name=MiniSAT \ com.oracle.info.version=1.14.1 license cr_Oracle license=cr_Oracle -depend type=conditional fmri=package/pkg-311 predicate=runtime/python-311 +depend type=conditional fmri=package/pkg-39 predicate=runtime/python-39 depend type=group fmri=package/pkg/zones-proxy \ variant.opensolaris.zone=nonglobal # cross zone dependency on linked image metadata @@ -299,4 +299,4 @@ depend type=parent fmri=feature/package/dependency/self \ variant.opensolaris.zone=nonglobal depend type=require fmri=crypto/ca-certificates # CFFI import is done in C code, so it isn't picked up by pkgdepend -depend type=require fmri=library/python/cffi-39@1.15.1 +depend type=require fmri=library/python/cffi-311@1.15.1 diff --git a/src/pkg/manifests/package:pkg:depot.p5m b/src/pkg/manifests/package:pkg:depot.p5m index 160ab9cf..9bee9ba1 100644 --- a/src/pkg/manifests/package:pkg:depot.p5m +++ b/src/pkg/manifests/package:pkg:depot.p5m @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2023, Oracle and/or its affiliates. +# Copyright (c) 2013, 2024, Oracle and/or its affiliates. # set name=pkg.fmri value=pkg:/package/pkg/depot@$(PKGVERS) @@ -71,4 +71,4 @@ license cr_Oracle license=cr_Oracle depend type=require fmri=web/server/apache-24 depend type=require fmri=web/server/apache-24/module/apache-ssl # p5p support in the system repository requires mod_wsgi -depend type=require fmri=web/server/apache-24/module/apache-wsgi-39 +depend type=require fmri=web/server/apache-24/module/apache-wsgi-311 diff --git a/src/pkg/manifests/package:pkg:system-repository.p5m b/src/pkg/manifests/package:pkg:system-repository.p5m index 8047dac6..f00097d4 100644 --- a/src/pkg/manifests/package:pkg:system-repository.p5m +++ b/src/pkg/manifests/package:pkg:system-repository.p5m @@ -73,4 +73,4 @@ depend type=conditional fmri=web/server/apache-24/module/apache-ssl-fips-140 \ depend type=require fmri=web/server/apache-24 depend type=require fmri=web/server/apache-24/module/apache-ssl # p5p support in the system repository requires mod_wsgi -depend type=require fmri=web/server/apache-24/module/apache-wsgi-39 +depend type=require fmri=web/server/apache-24/module/apache-wsgi-311 diff --git a/src/pkgdep.py b/src/pkgdep.py index 35a4e748..e41e2fa8 100755 --- a/src/pkgdep.py +++ b/src/pkgdep.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/pkgrepo.py b/src/pkgrepo.py index abfd1a68..9127c37d 100755 --- a/src/pkgrepo.py +++ b/src/pkgrepo.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/publish.py b/src/publish.py index bafbe311..afb20223 100755 --- a/src/publish.py +++ b/src/publish.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/pull.py b/src/pull.py index 54f69a7c..0060c68d 100755 --- a/src/pull.py +++ b/src/pull.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/rad-invoke.py b/src/rad-invoke.py index 1fb77b17..5af28792 100644 --- a/src/rad-invoke.py +++ b/src/rad-invoke.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/sign.py b/src/sign.py index 0f0a1ffd..c32822af 100755 --- a/src/sign.py +++ b/src/sign.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/svc/svc-pkg-auto-update b/src/svc/svc-pkg-auto-update index 7e781c34..c6da9d9a 100755 --- a/src/svc/svc-pkg-auto-update +++ b/src/svc/svc-pkg-auto-update @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -uEs +#!/usr/bin/python3.11 -uEs # # CDDL HEADER START # diff --git a/src/svc/svc-pkg-auto-update-cleanup b/src/svc/svc-pkg-auto-update-cleanup index 2db72ccb..2302d3e7 100755 --- a/src/svc/svc-pkg-auto-update-cleanup +++ b/src/svc/svc-pkg-auto-update-cleanup @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -uEs +#!/usr/bin/python3.11 -uEs # # CDDL HEADER START # @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright (c) 2019, 2023, Oracle and/or its affiliates. +# Copyright (c) 2019, 2024, Oracle and/or its affiliates. # import pkg.no_site_packages diff --git a/src/sysrepo.py b/src/sysrepo.py index ad318fdc..7b7926ce 100755 --- a/src/sysrepo.py +++ b/src/sysrepo.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/util/log-scripts/log.py b/src/util/log-scripts/log.py index a0c3b577..2719c6a6 100644 --- a/src/util/log-scripts/log.py +++ b/src/util/log-scripts/log.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/util/publish/pkgdiff.py b/src/util/publish/pkgdiff.py index 0ac9288e..585e5056 100755 --- a/src/util/publish/pkgdiff.py +++ b/src/util/publish/pkgdiff.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/util/publish/pkgfmt.py b/src/util/publish/pkgfmt.py index 84579dd3..30560bd9 100755 --- a/src/util/publish/pkgfmt.py +++ b/src/util/publish/pkgfmt.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/util/publish/pkglint.py b/src/util/publish/pkglint.py index ba9a61e5..ba6420b5 100755 --- a/src/util/publish/pkglint.py +++ b/src/util/publish/pkglint.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -BEs +#!/usr/bin/python3.11 -BEs # # CDDL HEADER START # diff --git a/src/util/publish/pkgmerge.py b/src/util/publish/pkgmerge.py index bf7aa5a7..b599088e 100755 --- a/src/util/publish/pkgmerge.py +++ b/src/util/publish/pkgmerge.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/util/publish/pkgmogrify.py b/src/util/publish/pkgmogrify.py index f75a23a6..3f59ece5 100755 --- a/src/util/publish/pkgmogrify.py +++ b/src/util/publish/pkgmogrify.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/util/publish/pkgsurf.py b/src/util/publish/pkgsurf.py index 9ce80676..6f6822bd 100755 --- a/src/util/publish/pkgsurf.py +++ b/src/util/publish/pkgsurf.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 -Es +#!/usr/bin/python3.11 -Es # # CDDL HEADER START # diff --git a/src/util/publish/update_file_layout.py b/src/util/publish/update_file_layout.py index 68e13549..1b8f3967 100755 --- a/src/util/publish/update_file_layout.py +++ b/src/util/publish/update_file_layout.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 +#!/usr/bin/python3.11 # # CDDL HEADER START # diff --git a/src/util/qual-simulator/Makefile b/src/util/qual-simulator/Makefile index 3b3869bf..37e3abc7 100644 --- a/src/util/qual-simulator/Makefile +++ b/src/util/qual-simulator/Makefile @@ -19,11 +19,11 @@ # CDDL HEADER END # -# Copyright (c) 2009, 2023, Oracle and/or its affiliates. +# Copyright (c) 2009, 2024, Oracle and/or its affiliates. # run: stats.py - python3.9 scenario.py + python3.11 scenario.py stats.py: cp ../../modules/client/transport/stats.py . diff --git a/src/util/qual-simulator/scenario.py b/src/util/qual-simulator/scenario.py index d0f432c5..45fc4926 100644 --- a/src/util/qual-simulator/scenario.py +++ b/src/util/qual-simulator/scenario.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.9 +#!/usr/bin/python3.11 # # CDDL HEADER START #