From 8744e5df7779692862b0f6508e83290c35d267a5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 18 Jul 2023 09:53:26 +1200 Subject: [PATCH] bootstrap: Heimdal no longer requires perl-JSON Heimdal after lorikeet-heimdal-202307040259 (commit 33d117b8a9c11714ef709e63a005d87e34b9bfde) includes Heimdal master commit f62e2f278437ff6c03d2d09bd628381c795bba78. This has PR https://github.com/heimdal/heimdal/pull/1176 and no longer requires the external JSON module, as JSON::PP is builtin. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15394 Signed-off-by: Andrew Bartlett Reviewed-by: Joseph Sutton --- .gitlab-ci-main.yml | 2 +- WHATSNEW.txt | 13 +++++++++++++ bootstrap/config.py | 2 -- bootstrap/generated-dists/centos7/bootstrap.sh | 2 -- bootstrap/generated-dists/centos7/packages.yml | 2 -- bootstrap/generated-dists/centos8s/bootstrap.sh | 1 - bootstrap/generated-dists/centos8s/packages.yml | 1 - .../generated-dists/debian11-32bit/bootstrap.sh | 1 - .../generated-dists/debian11-32bit/packages.yml | 1 - bootstrap/generated-dists/debian11/bootstrap.sh | 1 - bootstrap/generated-dists/debian11/packages.yml | 1 - .../generated-dists/debian12-32bit/bootstrap.sh | 1 - .../generated-dists/debian12-32bit/packages.yml | 1 - bootstrap/generated-dists/debian12/bootstrap.sh | 1 - bootstrap/generated-dists/debian12/packages.yml | 1 - bootstrap/generated-dists/fedora38/bootstrap.sh | 2 -- bootstrap/generated-dists/fedora38/packages.yml | 2 -- bootstrap/generated-dists/opensuse155/bootstrap.sh | 2 -- bootstrap/generated-dists/opensuse155/packages.yml | 2 -- .../generated-dists/ubuntu1804-32bit/bootstrap.sh | 1 - .../generated-dists/ubuntu1804-32bit/packages.yml | 1 - bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 1 - bootstrap/generated-dists/ubuntu1804/packages.yml | 1 - bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 1 - bootstrap/generated-dists/ubuntu2004/packages.yml | 1 - bootstrap/generated-dists/ubuntu2204/bootstrap.sh | 1 - bootstrap/generated-dists/ubuntu2204/packages.yml | 1 - bootstrap/sha1sum.txt | 2 +- 28 files changed, 15 insertions(+), 34 deletions(-) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 779eedb8255..ca240ae1fee 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -47,7 +47,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 190a74ee9628f298961d890ba37fcc7d213daae2 + SAMBA_CI_CONTAINER_TAG: 2671a34d464cd0e799d736535fccadc570433f51 # # We use the ubuntu2204 image as default as # it matches what we have on atb-devel-224 diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 94a5cf45f40..cd0092058ab 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -16,6 +16,19 @@ UPGRADING NEW FEATURES/CHANGES ==================== +Removed dependency on Perl JSON module +-------------------------------------- + +Distributions are advised that the Perl JSON package is no longer +required by Samba builds that use the imported Heimdal. The build +instead uses Perl's JSON::PP built into recent perl5 versions. + +Current lists of packages required by Samba for major distributions +are found in the bootstrap/generated-dists/ directory of a Samba +source tree. While there will be some differences - due to features +chosen by packagers - comparing these lists with the build dependencies +in a package may locate other dependencies we no longer require. + REMOVED FEATURES ================ diff --git a/bootstrap/config.py b/bootstrap/config.py index 5daf2d3ce54..d3dfc4d61f3 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -156,8 +156,6 @@ PKGS = [ # perl ('libparse-yapp-perl', 'perl-Parse-Yapp'), - ('libjson-perl', 'perl-JSON'), - ('', 'perl-JSON-Parse'), ('perl-modules', ''), ('', 'perl-FindBin'), ('', 'perl-Archive-Tar'), diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index aa0638e9765..fd867616a46 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -74,8 +74,6 @@ yum install -y \ patch \ perl-Archive-Tar \ perl-ExtUtils-MakeMaker \ - perl-JSON \ - perl-JSON-Parse \ perl-Parse-Yapp \ perl-Test-Base \ perl-core \ diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index edcc34791ec..2234bafc21b 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -60,8 +60,6 @@ packages: - patch - perl-Archive-Tar - perl-ExtUtils-MakeMaker - - perl-JSON - - perl-JSON-Parse - perl-Parse-Yapp - perl-Test-Base - perl-core diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh index 6a76d40d70e..4b2c62c66d9 100755 --- a/bootstrap/generated-dists/centos8s/bootstrap.sh +++ b/bootstrap/generated-dists/centos8s/bootstrap.sh @@ -82,7 +82,6 @@ yum install -y \ perl \ perl-Archive-Tar \ perl-ExtUtils-MakeMaker \ - perl-JSON \ perl-Parse-Yapp \ perl-Test-Simple \ perl-generators \ diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml index 49455ff3be2..f416dea4f5e 100644 --- a/bootstrap/generated-dists/centos8s/packages.yml +++ b/bootstrap/generated-dists/centos8s/packages.yml @@ -64,7 +64,6 @@ packages: - perl - perl-Archive-Tar - perl-ExtUtils-MakeMaker - - perl-JSON - perl-Parse-Yapp - perl-Test-Simple - perl-generators diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh index bee0897803e..6d9fd592fd9 100755 --- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh +++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh @@ -57,7 +57,6 @@ apt-get -y install \ libicu-dev \ libjansson-dev \ libjs-jquery \ - libjson-perl \ libkeyutils-dev \ libkrb5-dev \ libldap2-dev \ diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml index 07f12047814..97e92fea247 100644 --- a/bootstrap/generated-dists/debian11-32bit/packages.yml +++ b/bootstrap/generated-dists/debian11-32bit/packages.yml @@ -46,7 +46,6 @@ packages: - libicu-dev - libjansson-dev - libjs-jquery - - libjson-perl - libkeyutils-dev - libkrb5-dev - libldap2-dev diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh index bee0897803e..6d9fd592fd9 100755 --- a/bootstrap/generated-dists/debian11/bootstrap.sh +++ b/bootstrap/generated-dists/debian11/bootstrap.sh @@ -57,7 +57,6 @@ apt-get -y install \ libicu-dev \ libjansson-dev \ libjs-jquery \ - libjson-perl \ libkeyutils-dev \ libkrb5-dev \ libldap2-dev \ diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml index 07f12047814..97e92fea247 100644 --- a/bootstrap/generated-dists/debian11/packages.yml +++ b/bootstrap/generated-dists/debian11/packages.yml @@ -46,7 +46,6 @@ packages: - libicu-dev - libjansson-dev - libjs-jquery - - libjson-perl - libkeyutils-dev - libkrb5-dev - libldap2-dev diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh index 677fb9d8727..d6f53c29f8e 100755 --- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh +++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh @@ -57,7 +57,6 @@ apt-get -y install \ libicu-dev \ libjansson-dev \ libjs-jquery \ - libjson-perl \ libkeyutils-dev \ libkrb5-dev \ libldap2-dev \ diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml index 2514914d810..a9547d57380 100644 --- a/bootstrap/generated-dists/debian12-32bit/packages.yml +++ b/bootstrap/generated-dists/debian12-32bit/packages.yml @@ -46,7 +46,6 @@ packages: - libicu-dev - libjansson-dev - libjs-jquery - - libjson-perl - libkeyutils-dev - libkrb5-dev - libldap2-dev diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh index 677fb9d8727..d6f53c29f8e 100755 --- a/bootstrap/generated-dists/debian12/bootstrap.sh +++ b/bootstrap/generated-dists/debian12/bootstrap.sh @@ -57,7 +57,6 @@ apt-get -y install \ libicu-dev \ libjansson-dev \ libjs-jquery \ - libjson-perl \ libkeyutils-dev \ libkrb5-dev \ libldap2-dev \ diff --git a/bootstrap/generated-dists/debian12/packages.yml b/bootstrap/generated-dists/debian12/packages.yml index 2514914d810..a9547d57380 100644 --- a/bootstrap/generated-dists/debian12/packages.yml +++ b/bootstrap/generated-dists/debian12/packages.yml @@ -46,7 +46,6 @@ packages: - libicu-dev - libjansson-dev - libjs-jquery - - libjson-perl - libkeyutils-dev - libkrb5-dev - libldap2-dev diff --git a/bootstrap/generated-dists/fedora38/bootstrap.sh b/bootstrap/generated-dists/fedora38/bootstrap.sh index 2b43dfc4e04..08290dcf624 100755 --- a/bootstrap/generated-dists/fedora38/bootstrap.sh +++ b/bootstrap/generated-dists/fedora38/bootstrap.sh @@ -79,8 +79,6 @@ dnf install -y \ perl \ perl-Archive-Tar \ perl-ExtUtils-MakeMaker \ - perl-JSON \ - perl-JSON-Parse \ perl-Parse-Yapp \ perl-Test-Base \ perl-generators \ diff --git a/bootstrap/generated-dists/fedora38/packages.yml b/bootstrap/generated-dists/fedora38/packages.yml index c5f9bc50574..095aa28948e 100644 --- a/bootstrap/generated-dists/fedora38/packages.yml +++ b/bootstrap/generated-dists/fedora38/packages.yml @@ -68,8 +68,6 @@ packages: - perl - perl-Archive-Tar - perl-ExtUtils-MakeMaker - - perl-JSON - - perl-JSON-Parse - perl-Parse-Yapp - perl-Test-Base - perl-generators diff --git a/bootstrap/generated-dists/opensuse155/bootstrap.sh b/bootstrap/generated-dists/opensuse155/bootstrap.sh index b82d1b61577..878ac7fb482 100755 --- a/bootstrap/generated-dists/opensuse155/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse155/bootstrap.sh @@ -76,8 +76,6 @@ zypper --non-interactive install \ perl \ perl-Archive-Tar-Wrapper \ perl-ExtUtils-MakeMaker \ - perl-JSON \ - perl-JSON-XS \ perl-Parse-Yapp \ perl-Test-Base \ pkgconfig \ diff --git a/bootstrap/generated-dists/opensuse155/packages.yml b/bootstrap/generated-dists/opensuse155/packages.yml index 93de86726a4..679683996f9 100644 --- a/bootstrap/generated-dists/opensuse155/packages.yml +++ b/bootstrap/generated-dists/opensuse155/packages.yml @@ -64,8 +64,6 @@ packages: - perl - perl-Archive-Tar-Wrapper - perl-ExtUtils-MakeMaker - - perl-JSON - - perl-JSON-XS - perl-Parse-Yapp - perl-Test-Base - pkgconfig diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh index 78de9565b88..10276208d68 100755 --- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh @@ -58,7 +58,6 @@ apt-get -y install \ libicu-dev \ libjansson-dev \ libjs-jquery \ - libjson-perl \ libkeyutils-dev \ libkrb5-dev \ libldap2-dev \ diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml index bef96d0280f..2544f9cf8f5 100644 --- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml +++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml @@ -47,7 +47,6 @@ packages: - libicu-dev - libjansson-dev - libjs-jquery - - libjson-perl - libkeyutils-dev - libkrb5-dev - libldap2-dev diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh index 78de9565b88..10276208d68 100755 --- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh @@ -58,7 +58,6 @@ apt-get -y install \ libicu-dev \ libjansson-dev \ libjs-jquery \ - libjson-perl \ libkeyutils-dev \ libkrb5-dev \ libldap2-dev \ diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml index bef96d0280f..2544f9cf8f5 100644 --- a/bootstrap/generated-dists/ubuntu1804/packages.yml +++ b/bootstrap/generated-dists/ubuntu1804/packages.yml @@ -47,7 +47,6 @@ packages: - libicu-dev - libjansson-dev - libjs-jquery - - libjson-perl - libkeyutils-dev - libkrb5-dev - libldap2-dev diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh index 78de9565b88..10276208d68 100755 --- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh @@ -58,7 +58,6 @@ apt-get -y install \ libicu-dev \ libjansson-dev \ libjs-jquery \ - libjson-perl \ libkeyutils-dev \ libkrb5-dev \ libldap2-dev \ diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml index bef96d0280f..2544f9cf8f5 100644 --- a/bootstrap/generated-dists/ubuntu2004/packages.yml +++ b/bootstrap/generated-dists/ubuntu2004/packages.yml @@ -47,7 +47,6 @@ packages: - libicu-dev - libjansson-dev - libjs-jquery - - libjson-perl - libkeyutils-dev - libkrb5-dev - libldap2-dev diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh index 5375052a438..d8a7a72178f 100755 --- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh @@ -58,7 +58,6 @@ apt-get -y install \ libicu-dev \ libjansson-dev \ libjs-jquery \ - libjson-perl \ libkeyutils-dev \ libkrb5-dev \ libldap2-dev \ diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml index eee8d9cdfd4..a22a4100fc6 100644 --- a/bootstrap/generated-dists/ubuntu2204/packages.yml +++ b/bootstrap/generated-dists/ubuntu2204/packages.yml @@ -47,7 +47,6 @@ packages: - libicu-dev - libjansson-dev - libjs-jquery - - libjson-perl - libkeyutils-dev - libkrb5-dev - libldap2-dev diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 11ab035f572..76226ccefaf 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -190a74ee9628f298961d890ba37fcc7d213daae2 +2671a34d464cd0e799d736535fccadc570433f51