1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

bootstrap: we don't need python-crypt-r anymore

Recent commits made pyglue wrap the same crypt[_r] that dsdb modules
use, which removes an extenal dependency.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15756

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Douglas Bagnall 2024-12-12 10:35:02 +13:00 committed by Andreas Schneider
parent 552053b644
commit 929f4d0ca5
5 changed files with 2 additions and 11 deletions

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: d101907857587b6421907c45676497c336d45ea7
SAMBA_CI_CONTAINER_TAG: a234da56a3f4ea96265e6c8a308051be3478ab22
#
# We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224

View File

@ -159,10 +159,6 @@ PKGS = [
('', 'python3-libsemanage'),
('', 'python3-policycoreutils'),
# A copy of the `crypt` module that was removed in Python 3.13
# See also https://bugzilla.samba.org/show_bug.cgi?id=15756
('', 'python3-crypt-r'),
# perl
('libparse-yapp-perl', 'perl-Parse-Yapp'),
('perl-modules', ''),
@ -538,7 +534,6 @@ RPM_DISTS = {
'ShellCheck': '',
'shfmt': '',
'codespell': '',
'python3-crypt-r': '',
}
},
'centos9s': {
@ -558,7 +553,6 @@ RPM_DISTS = {
'codespell': '',
'libcephfs-devel': '', # not available anymore
'curl': '', # Use installed curl-minimal
'python3-crypt-r': '',
}
},
'fedora41': {
@ -587,7 +581,6 @@ RPM_DISTS = {
'keyutils-libs-devel': 'keyutils-devel',
'krb5-workstation': 'krb5-client',
'python3-libsemanage': 'python3-semanage',
'python3-crypt-r': '',
'openldap-devel': 'openldap2-devel',
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
'perl-JSON-Parse': 'perl-JSON-XS',

View File

@ -92,7 +92,6 @@ dnf install -y \
procps-ng \
psmisc \
python3 \
python3-crypt-r \
python3-cryptography \
python3-dateutil \
python3-devel \

View File

@ -81,7 +81,6 @@ packages:
- procps-ng
- psmisc
- python3
- python3-crypt-r
- python3-cryptography
- python3-dateutil
- python3-devel

View File

@ -1 +1 @@
d101907857587b6421907c45676497c336d45ea7
a234da56a3f4ea96265e6c8a308051be3478ab22