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 <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 779eedb8255884a684dc8b533f71de8c2b6fdd69..ca240ae1feef4f5a87465429526e5b5aa390f6de 100644 (file)
--- 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 94a5cf45f409dfbd82a0e469aebf596ae46de798..cd0092058abc1acb79021f9a75cca336ee88fc44 100644 (file)
--- 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 5daf2d3ce5474da2624c540c4b3dbaa577693c33..d3dfc4d61f3680184646254776b339b14a02662a 100644 (file)
--- 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 aa0638e976583e0ba4eb45733d4e01ec8d629a1a..fd867616a46db70efa24f622c1b6e7e2cf3ba721 100755 (executable)
--- 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 edcc34791ec00e7a7e5d455a6a85897c9dede230..2234bafc21bebbeb8f6b53afec62cb5291e294bc 100644 (file)
--- 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 6a76d40d70e2f5b0e698f8dd76ccb32afdcf1d29..4b2c62c66d9a5cfd8b92dbdc9035765264a757fa 100755 (executable)
--- 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 49455ff3be21ed4253193b69f1ff5ee96484fd40..f416dea4f5ebcacc0c553e56181ec2e1b15dc4c3 100644 (file)
--- 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 bee0897803e148f0add19907c98229f39bdf6dfe..6d9fd592fd9e821c4226282e0df820632b002312 100755 (executable)
--- 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 07f120478146c85c6596261c0d4764bc5c27854d..97e92fea247dfba9e9f96c3b874a192ff8f8f1b1 100644 (file)
--- 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 bee0897803e148f0add19907c98229f39bdf6dfe..6d9fd592fd9e821c4226282e0df820632b002312 100755 (executable)
--- 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 07f120478146c85c6596261c0d4764bc5c27854d..97e92fea247dfba9e9f96c3b874a192ff8f8f1b1 100644 (file)
--- 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 677fb9d872702d79144bba823f73e19112c0e72f..d6f53c29f8ea7f4403bf3778047378a1b04b6ea5 100755 (executable)
--- 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 2514914d810ba428c54878594bbe84f8efc9e8b5..a9547d57380622823d7caa0bede69dd20b1646b6 100644 (file)
--- 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 677fb9d872702d79144bba823f73e19112c0e72f..d6f53c29f8ea7f4403bf3778047378a1b04b6ea5 100755 (executable)
--- 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 2514914d810ba428c54878594bbe84f8efc9e8b5..a9547d57380622823d7caa0bede69dd20b1646b6 100644 (file)
--- 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 2b43dfc4e047efc58b631377471f30598ac00dd0..08290dcf624ab6929e6780cf154cf063f3293710 100755 (executable)
--- 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 c5f9bc5057452b9d85e0788b3e513e3b70d0feb9..095aa28948e607c5b203c57afe2d67e391976579 100644 (file)
--- 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 b82d1b615775e8ffcf1d137ebcdea42af9716c95..878ac7fb482d005ad1e8383d9f44f911e21bf387 100755 (executable)
--- 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 93de86726a482f0c877c160621ae23ad63fc8958..679683996f98b5a4212b3ccc27b5696d08a83505 100644 (file)
--- 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 78de9565b88430467250b39ab32d4411c7c5123b..10276208d68c1ed5de3bcf41c9cef0207598e158 100755 (executable)
--- 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 bef96d0280fce924e3c88c5808e4adef5a0d9ff1..2544f9cf8f56c368ba82a9cd367c29b830ac9cca 100644 (file)
--- 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 78de9565b88430467250b39ab32d4411c7c5123b..10276208d68c1ed5de3bcf41c9cef0207598e158 100755 (executable)
--- 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 bef96d0280fce924e3c88c5808e4adef5a0d9ff1..2544f9cf8f56c368ba82a9cd367c29b830ac9cca 100644 (file)
--- 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 78de9565b88430467250b39ab32d4411c7c5123b..10276208d68c1ed5de3bcf41c9cef0207598e158 100755 (executable)
--- 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 bef96d0280fce924e3c88c5808e4adef5a0d9ff1..2544f9cf8f56c368ba82a9cd367c29b830ac9cca 100644 (file)
--- 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 5375052a438609e010e5ba28b092f3eadcc41ed6..d8a7a72178f4cf8ce9f57d4435e5d9acaecc7a7b 100755 (executable)
--- 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 eee8d9cdfd4ba01d7a5569ea34d98f2cc748c10a..a22a4100fc67dc9f1de62a47d9415efdebd3146f 100644 (file)
--- 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 11ab035f5723ea7193c63bb47b1d44af04364164..76226ccefaf1ac4404af71a1da96f18d6ddc1085 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-190a74ee9628f298961d890ba37fcc7d213daae2
+2671a34d464cd0e799d736535fccadc570433f51