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>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index a4bfc48d6bae7b27af6af91fd5d0d251a069763c..6a27d0359288662580e053352f605e4c38cf4d44 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: d101907857587b6421907c45676497c336d45ea7
+  SAMBA_CI_CONTAINER_TAG: a234da56a3f4ea96265e6c8a308051be3478ab22
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224

diff --git a/bootstrap/config.py b/bootstrap/config.py
index e7c0a0deb51fa0b73c93df5d9aad2a45a658e6ff..f65b6b3dab7f49a3818a9a8137065f5985b714df 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -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',

diff --git a/bootstrap/generated-dists/fedora41/bootstrap.sh b/bootstrap/generated-dists/fedora41/bootstrap.sh
index 941f7b321851310d5fda22110002f3d890534487..22d2fa8974509072eb28550ae4273dc1cd64cfb4 100755 (executable)
--- a/bootstrap/generated-dists/fedora41/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora41/bootstrap.sh
@@ -92,7 +92,6 @@ dnf install -y \
     procps-ng \
     psmisc \
     python3 \
-    python3-crypt-r \
     python3-cryptography \
     python3-dateutil \
     python3-devel \

diff --git a/bootstrap/generated-dists/fedora41/packages.yml b/bootstrap/generated-dists/fedora41/packages.yml
index f00bacbd98891a0c5a58a2b81849de360b80ae43..532ac877fddbb649175fff8af27c762609a9106f 100644 (file)
--- a/bootstrap/generated-dists/fedora41/packages.yml
+++ b/bootstrap/generated-dists/fedora41/packages.yml
@@ -81,7 +81,6 @@ packages:
   - procps-ng
   - psmisc
   - python3
-  - python3-crypt-r
   - python3-cryptography
   - python3-dateutil
   - python3-devel

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 401c5fda44b97cd52438a05a83bb501bb5b4c95f..d011893c3ae34d86731e05a29b8ab7729751a7e2 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-d101907857587b6421907c45676497c336d45ea7
+a234da56a3f4ea96265e6c8a308051be3478ab22