sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

bootstrap: Heimdal no longer requires perl-JSON

Browse Source 
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>
This commit is contained in:
Andrew Bartlett 2023-07-18 09:53:26 +12:00
parent 26329a69cd
commit 8744e5df77
28 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci-main.yml
View File

@ -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

13
WHATSNEW.txt
View File

@ -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
================

2
bootstrap/config.py
View File

@ -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'),

2
bootstrap/generated-dists/centos7/bootstrap.sh
View File

@ -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 \

2
bootstrap/generated-dists/centos7/packages.yml
View File

@ -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

1
bootstrap/generated-dists/centos8s/bootstrap.sh
View File

@ -82,7 +82,6 @@ yum install -y \
perl \
perl-Archive-Tar \
perl-ExtUtils-MakeMaker \
perl-JSON \
perl-Parse-Yapp \
perl-Test-Simple \
perl-generators \

1
bootstrap/generated-dists/centos8s/packages.yml
View File

@ -64,7 +64,6 @@ packages:
- perl
- perl-Archive-Tar
- perl-ExtUtils-MakeMaker
- perl-JSON
- perl-Parse-Yapp
- perl-Test-Simple
- perl-generators

1
bootstrap/generated-dists/debian11-32bit/bootstrap.sh
View File

@ -57,7 +57,6 @@ apt-get -y install \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkeyutils-dev \
libkrb5-dev \
libldap2-dev \

1
bootstrap/generated-dists/debian11-32bit/packages.yml
View File

@ -46,7 +46,6 @@ packages:
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkeyutils-dev
- libkrb5-dev
- libldap2-dev

1
bootstrap/generated-dists/debian11/bootstrap.sh
View File

@ -57,7 +57,6 @@ apt-get -y install \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkeyutils-dev \
libkrb5-dev \
libldap2-dev \

1
bootstrap/generated-dists/debian11/packages.yml
View File

@ -46,7 +46,6 @@ packages:
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkeyutils-dev
- libkrb5-dev
- libldap2-dev

1
bootstrap/generated-dists/debian12-32bit/bootstrap.sh
View File

@ -57,7 +57,6 @@ apt-get -y install \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkeyutils-dev \
libkrb5-dev \
libldap2-dev \

1
bootstrap/generated-dists/debian12-32bit/packages.yml
View File

@ -46,7 +46,6 @@ packages:
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkeyutils-dev
- libkrb5-dev
- libldap2-dev

1
bootstrap/generated-dists/debian12/bootstrap.sh
View File

@ -57,7 +57,6 @@ apt-get -y install \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkeyutils-dev \
libkrb5-dev \
libldap2-dev \

1
bootstrap/generated-dists/debian12/packages.yml
View File

@ -46,7 +46,6 @@ packages:
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkeyutils-dev
- libkrb5-dev
- libldap2-dev

2
bootstrap/generated-dists/fedora38/bootstrap.sh
View File

@ -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 \

2
bootstrap/generated-dists/fedora38/packages.yml
View File

@ -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

2
bootstrap/generated-dists/opensuse155/bootstrap.sh
View File

@ -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 \

2
bootstrap/generated-dists/opensuse155/packages.yml
View File

@ -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

1
bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
View File

@ -58,7 +58,6 @@ apt-get -y install \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkeyutils-dev \
libkrb5-dev \
libldap2-dev \

1
bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
View File

@ -47,7 +47,6 @@ packages:
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkeyutils-dev
- libkrb5-dev
- libldap2-dev

1
bootstrap/generated-dists/ubuntu1804/bootstrap.sh
View File

@ -58,7 +58,6 @@ apt-get -y install \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkeyutils-dev \
libkrb5-dev \
libldap2-dev \

1
bootstrap/generated-dists/ubuntu1804/packages.yml
View File

@ -47,7 +47,6 @@ packages:
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkeyutils-dev
- libkrb5-dev
- libldap2-dev

1
bootstrap/generated-dists/ubuntu2004/bootstrap.sh
View File

@ -58,7 +58,6 @@ apt-get -y install \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkeyutils-dev \
libkrb5-dev \
libldap2-dev \

1
bootstrap/generated-dists/ubuntu2004/packages.yml
View File

@ -47,7 +47,6 @@ packages:
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkeyutils-dev
- libkrb5-dev
- libldap2-dev

1
bootstrap/generated-dists/ubuntu2204/bootstrap.sh
View File

@ -58,7 +58,6 @@ apt-get -y install \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkeyutils-dev \
libkrb5-dev \
libldap2-dev \

1
bootstrap/generated-dists/ubuntu2204/packages.yml
View File

@ -47,7 +47,6 @@ packages:
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkeyutils-dev
- libkrb5-dev
- libldap2-dev

2
bootstrap/sha1sum.txt
View File

@ -1 +1 @@
190a74ee9628f298961d890ba37fcc7d213daae2
2671a34d464cd0e799d736535fccadc570433f51