bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 12:05:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: 389-ds-base: Fix LegacyVersion issue.

Browse source 
LegacyVersion does not exist anymore in packaging.version 25.0
(https://github.com/pypa/packaging/pull/407). Add a stub to prevent runtime
errors such as:

Traceback (most recent call last):
  File "/gnu/store/jq8iknqq5niwx9vchccbnnw6jdb3x8nq-389-ds-base-2.2.2/sbin/.dscreate-real", line 18, in <module>
    from lib389 import DirSrv
  File "/gnu/store/jq8iknqq5niwx9vchccbnnw6jdb3x8nq-389-ds-base-2.2.2/lib/python3.11/site-packages/lib389/__init__.py", line 54, in <module>
    from lib389._entry import Entry
  File "/gnu/store/jq8iknqq5niwx9vchccbnnw6jdb3x8nq-389-ds-base-2.2.2/lib/python3.11/site-packages/lib389/_entry.py", line 20, in <module>
    from lib389.utils import (ensure_str, ensure_bytes, ensure_list_bytes, display_log_data)
  File "/gnu/store/jq8iknqq5niwx9vchccbnnw6jdb3x8nq-389-ds-base-2.2.2/lib/python3.11/site-packages/lib389/utils.py", line 49, in <module>
    from packaging.version import LegacyVersion
ImportError: cannot import name 'LegacyVersion' from 'packaging.version' (/gnu/store/5ga1x27pz9wqwhq3sndcymfngdvcr4w9-python-packaging-bootstrap-25.0/lib/python3.11/site-packages/packaging/version.py)

* gnu/packages/patches/389-ds-base-legacy-version.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/openldap.scm (389-ds-base): Use it.

Change-Id: I34c12dce3092f9911383ae380af13ef74285ebc4
This commit is contained in:
Mathieu Othacehe 2025-10-21 13:15:40 +02:00
parent f91286326a
commit 5dca11e5e5
No known key found for this signature in database
GPG key ID: 8354763531769CA6
3 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -955,6 +955,7 @@ MODULES_NOT_COMPILED += \
patchdir = $(guilemoduledir)/%D%/packages/patches
dist_patch_DATA = \
%D%/packages/patches/389-ds-base-legacy-version.patch \
%D%/packages/patches/8mq-enable-imx_hab_handler.patch \
%D%/packages/patches/8mq-move-stack-to-ocram_s.patch \
%D%/packages/patches/abcl-fix-build-xml.patch \

1
gnu/packages/openldap.scm
View file

@ -236,6 +236,7 @@ servers from Python programs.")
(sha256
(base32
"1sdvfbjfg0091f47562gw3gdc2vgvvhyhdi21lrpwnw9lqc8xdxk"))
(patches (search-patches "389-ds-base-legacy-version.patch"))
(modules '((guix build utils)))
(snippet
;; Put '#define f_type' after '#include <sys/statvfs.h>' to

40
gnu/packages/patches/389-ds-base-legacy-version.patch Normal file
View file

@ -0,0 +1,40 @@
LegacyVersion does not exist anymore in packaging.version 25.0
(https://github.com/pypa/packaging/pull/407). This patch is needed until
389-ds-base is updated to a newer version.
diff --git a/src/lib389/lib389/utils_orig.py b/src/lib389/lib389/utils.py
index da966ed..30f127d 100644
--- a/src/lib389/lib389/utils.py
+++ b/src/lib389/lib389/utils.py
@@ -46,7 +46,12 @@ try:
from pkg_resources.extern.packaging.version import LegacyVersion
# Fallback to a normal 'packaging' module in case 'setuptools' is stripped
except:
- from packaging.version import LegacyVersion
+ from packaging.version import Version
+
+ # Define a stub LegacyVersion for compatibility.
+ class LegacyVersion(Version):
+ def __init__(self, v):
+ super().__init__(v)
from socket import getfqdn
from ldapurl import LDAPUrl
from contextlib import closing
diff --git a/src/lib389/lib389/nss_ssl_orig.py b/src/lib389/lib389/nss_ssl.py
index 3561597..6622a46 100644
--- a/src/lib389/lib389/nss_ssl_orig.py
+++ b/src/lib389/lib389/nss_ssl.py
@@ -31,7 +31,12 @@ try:
from pkg_resources.extern.packaging.version import LegacyVersion
# Fallback to a normal 'packaging' module in case 'setuptools' is stripped
except:
- from packaging.version import LegacyVersion
+ from packaging.version import Version
+
+ # Define a stub LegacyVersion for compatibility.
+ class LegacyVersion(Version):
+ def __init__(self, v):
+ super().__init__(v)
KEYBITS = 4096
CA_NAME = 'Self-Signed-CA'