[arch-commits] Commit in 389-ds-base/trunk (PKGBUILD bcf5e9f.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, December 11, 2019 @ 12:16:49
  Author: svenstaro
Revision: 370670

upgpkg: 389-ds-base 1.4.2.5-1

Added:
  389-ds-base/trunk/bcf5e9f.patch
Modified:
  389-ds-base/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 +++++++----
 bcf5e9f.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-11 11:44:43 UTC (rev 370669)
+++ PKGBUILD	2019-12-11 12:16:49 UTC (rev 370670)
@@ -4,7 +4,7 @@
 # Contributor: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
 
 pkgname=389-ds-base
-pkgver=1.4.2.4
+pkgver=1.4.2.5
 pkgdesc="389 Directory Server (base)"
 pkgrel=1
 arch=(x86_64)
@@ -20,10 +20,12 @@
 makedepends=(cargo rsync doxygen cmocka python-setuptools python-argparse-manpage)
 source=("https://releases.pagure.org/389-ds-base/${pkgname}-${pkgver}.tar.bz2"
         389-ds-base.sysusers
-        389-ds-base.tmpfiles)
-sha512sums=('b341bd55ef01b328b08de9dc88dca7dad7036064bda04469ebd650008ac4646395accacc32780bc7eab161a7fa5a8fa19f5511b827ab8a68b9c08dfc660969f1'
+        389-ds-base.tmpfiles
+        bcf5e9f.patch)
+sha512sums=('46cdf18809466faa2104a3fd5aa16d2b0525bc73c7a517e167c85cb0d6d6078e78b20a865c2eafe4671e11a2f0c879b1f1292c10d8a3aeb20da769511d60542a'
             '8689b60f13517e6541e1faa62e61781654a8e4678990d14a3fe0cfe4673697cdde1c46763fdc7ef6203e4026286fa004c73b2857fd7fecff69483e6d1e8e6d68'
-            '5dff695ae866a591a711f836f2f72f2005b4afdb20760cda8711791910299e2c6ec71dff5eca9a2d9832cad8f9e9904dbbcf2d314cd9b20432bc8fd05c097868')
+            '5dff695ae866a591a711f836f2f72f2005b4afdb20760cda8711791910299e2c6ec71dff5eca9a2d9832cad8f9e9904dbbcf2d314cd9b20432bc8fd05c097868'
+            'e80bbde036b0e1d6db4ccc800c429a5e4df06f26ecf709159510f0058d2031db1c8794418b74acf9f41cda3627891f38d5867cbff8e0a9569d41550af5feef88')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
@@ -32,6 +34,7 @@
   cargo fetch --manifest-path=./src/libsds/Cargo.toml
   cargo vendor --manifest-path=./src/librslapd/Cargo.toml
   cargo fetch --manifest-path=./src/librslapd/Cargo.toml
+  patch -Np1 -i "$srcdir"/bcf5e9f.patch
 
   autoreconf -fiv
 }

Added: bcf5e9f.patch
===================================================================
--- bcf5e9f.patch	                        (rev 0)
+++ bcf5e9f.patch	2019-12-11 12:16:49 UTC (rev 370670)
@@ -0,0 +1,41 @@
+From bcf5e9f980b3725b82e8f1ae4b4778150f67e225 Mon Sep 17 00:00:00 2001
+From: Viktor Ashirov <vashirov at redhat.com>
+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
+