Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / 389-ds-base
Commits: acd93df6 by Sven-Hendrik Haase at 2023-08-02T02:14:45+02:00 Remove old patches - - - - - 2 changed files: - − bcf5e9f.patch - − openldap-2.5.patch Changes: ===================================== bcf5e9f.patch deleted ===================================== @@ -1,41 +0,0 @@ -From bcf5e9f980b3725b82e8f1ae4b4778150f67e225 Mon Sep 17 00:00:00 2001 -From: Viktor Ashirov <[email protected]> -Date: Dec 10 2019 15:40:32 +0000 -Subject: Issue 50771 - 1.4.2.5 doesn't compile due to error ModuleNotFoundError: No module named 'pkg_resources.extern' - - -Bug Description: - -Arch Linux ships python-setuptools stripped of vendored packages. -This makes lib389 fail with ModuleNotFoundError on import. - -Fix Description: - -Use a fallback to `packaging` module. - -Fixes: https://pagure.io/389-ds-base/issue/50771 -Relates: https://pagure.io/389-ds-base/issue/50712 - -Reviewed by: mhonek (Thanks!) - ---- - -diff --git a/src/lib389/lib389/utils.py b/src/lib389/lib389/utils.py -index 70a3a10..36422dd 100644 ---- a/src/lib389/lib389/utils.py -+++ b/src/lib389/lib389/utils.py -@@ -40,7 +40,12 @@ import shlex - import operator - import subprocess - import math --from pkg_resources.extern.packaging.version import LegacyVersion -+# Setuptools ships with 'packaging' module, let's use it from there -+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 socket import getfqdn - from ldapurl import LDAPUrl - from contextlib import closing - ===================================== openldap-2.5.patch deleted ===================================== @@ -1,12 +0,0 @@ -diff -upr 389-ds-base-389-ds-base-2.0.10.orig/Makefile.am 389-ds-base-389-ds-base-2.0.10/Makefile.am ---- 389-ds-base-389-ds-base-2.0.10.orig/Makefile.am 2021-09-20 16:12:55.000000000 +0300 -+++ 389-ds-base-389-ds-base-2.0.10/Makefile.am 2021-11-13 23:02:18.801136472 +0200 -@@ -186,7 +186,7 @@ NSS_LINK = $(NSS_LIBS) - # with recent versions of openldap - if you link with both ldap_r and ldap, the - # shared lib _fini for one will stomp on the other, and the program will crash - LDAPSDK_LINK_NOTHR = @openldap_lib@ -lldap@ol_libver@ @ldap_lib_ldif@ -llber@ol_libver@ --LDAPSDK_LINK = @openldap_lib@ -lldap_r@ol_libver@ @ldap_lib_ldif@ -llber@ol_libver@ -+LDAPSDK_LINK = @openldap_lib@ -lldap@ol_libver@ @ldap_lib_ldif@ -llber@ol_libver@ - ldaplib = @ldaplib@ - ldaplib_defs = @ldaplib_defs@ - View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/389-ds-base/-/commit/acd93df63568f83e7b96e8173a5016f37180fd3c -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/389-ds-base/-/commit/acd93df63568f83e7b96e8173a5016f37180fd3c You're receiving this email because of your account on gitlab.archlinux.org.
