[arch-commits] Commit in 389-ds-base/repos (5 files)
Felix Yan
felixonmars at archlinux.org
Fri Nov 13 09:11:08 UTC 2020
Date: Friday, November 13, 2020 @ 09:11:08
Author: felixonmars
Revision: 400740
archrelease: copy trunk to staging-x86_64
Added:
389-ds-base/repos/staging-x86_64/
389-ds-base/repos/staging-x86_64/389-ds-base.sysusers
(from rev 400739, 389-ds-base/trunk/389-ds-base.sysusers)
389-ds-base/repos/staging-x86_64/389-ds-base.tmpfiles
(from rev 400739, 389-ds-base/trunk/389-ds-base.tmpfiles)
389-ds-base/repos/staging-x86_64/PKGBUILD
(from rev 400739, 389-ds-base/trunk/PKGBUILD)
389-ds-base/repos/staging-x86_64/bcf5e9f.patch
(from rev 400739, 389-ds-base/trunk/bcf5e9f.patch)
----------------------+
389-ds-base.sysusers | 1
389-ds-base.tmpfiles | 3 +
PKGBUILD | 95 +++++++++++++++++++++++++++++++++++++++++++++++++
bcf5e9f.patch | 41 +++++++++++++++++++++
4 files changed, 140 insertions(+)
Copied: 389-ds-base/repos/staging-x86_64/389-ds-base.sysusers (from rev 400739, 389-ds-base/trunk/389-ds-base.sysusers)
===================================================================
--- staging-x86_64/389-ds-base.sysusers (rev 0)
+++ staging-x86_64/389-ds-base.sysusers 2020-11-13 09:11:08 UTC (rev 400740)
@@ -0,0 +1 @@
+u dirsrv 440 "389 Directory Server" /var/lib/389-ds-base
Copied: 389-ds-base/repos/staging-x86_64/389-ds-base.tmpfiles (from rev 400739, 389-ds-base/trunk/389-ds-base.tmpfiles)
===================================================================
--- staging-x86_64/389-ds-base.tmpfiles (rev 0)
+++ staging-x86_64/389-ds-base.tmpfiles 2020-11-13 09:11:08 UTC (rev 400740)
@@ -0,0 +1,3 @@
+d /var/log/dirsrv 0700 dirsrv dirsrv -
+d /var/lib/dirsrv 0700 dirsrv dirsrv -
+d /run/lock/dirsrv 0770 dirsrv dirsrv -
Copied: 389-ds-base/repos/staging-x86_64/PKGBUILD (from rev 400739, 389-ds-base/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2020-11-13 09:11:08 UTC (rev 400740)
@@ -0,0 +1,95 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: Javier Torres <javitonino [at] gmail [dot] com>
+# Contributor: Jameson Pugh <imntreal at gmail.com>
+# Contributor: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
+
+pkgname=389-ds-base
+pkgver=1.4.4.4
+pkgdesc="389 Directory Server (base)"
+pkgrel=4
+arch=(x86_64)
+url="http://port389.org/"
+license=(GPL)
+provides=('libsvrcore.so')
+replaces=('python-lib389')
+backup=(etc/dirsrv/config/certmap.conf
+ etc/dirsrv/config/ldap-agent.conf
+ etc/dirsrv/config/slapd-collations.conf
+ etc/dirsrv/config/template-initconfig)
+depends=('cracklib' 'libevent' 'nspr' 'nss' 'net-snmp' 'pam' 'openldap' 'perl'
+ 'python-argcomplete' 'python-dateutil' 'python-ldap' 'python-packaging')
+makedepends=('cargo' 'rsync' 'doxygen' 'cmocka' 'python-setuptools' 'python-argparse-manpage'
+ 'npm' 'systemd' 'python2')
+source=(https://pagure.io/389-ds-base/archive/389-ds-base-${pkgver}/389-ds-base-389-ds-base-${pkgver}.tar.gz
+ 389-ds-base.sysusers
+ 389-ds-base.tmpfiles)
+sha512sums=('aca34f830cd8af45a3985f733a4453041addb50afb2c7050b5f9b4fee0dac8793d2b88816c7a49da4d58d68a288c71bcc54fc097569d22b4864f1ccfff2f9a5c'
+ '8689b60f13517e6541e1faa62e61781654a8e4678990d14a3fe0cfe4673697cdde1c46763fdc7ef6203e4026286fa004c73b2857fd7fecff69483e6d1e8e6d68'
+ '69ed8b8f3bdbf9098088b0c92c41a238f16d14ba9f86ebc2b5debe5f001b4d8e235f7cff4731d72b30b5ac70486b0f4300b99646aa3926a3fa59515a64f16402')
+
+prepare() {
+ cd "${pkgname}-${pkgname}-${pkgver}"
+
+ cargo vendor --manifest-path=./src/libsds/Cargo.toml
+ cargo fetch --manifest-path=./src/libsds/Cargo.toml
+ cargo vendor --manifest-path=./src/librslapd/Cargo.toml
+ cargo fetch --manifest-path=./src/librslapd/Cargo.toml
+
+ autoreconf -fiv
+}
+
+build() {
+ cd "${pkgname}-${pkgname}-${pkgver}"
+
+ # Build 389-ds-base
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/${pkgname} \
+ --with-tmpfiles-d=/usr/lib/tmpfiles.d \
+ --with-systemd \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --with-systemdsystemconfdir=/etc/systemd/system \
+ --with-journald \
+ --with-openldap \
+ --enable-autobind \
+ --enable-cmocka \
+ --enable-rust \
+ --enable-perl
+ make
+
+ # Build lib389
+ cd src/lib389
+ COLUMNS=80 python setup.py build
+
+ # Build cockpit plugin
+ cd ../cockpit/389-console
+ npm install
+ npm run build
+ mv dist cockpit_dist
+}
+
+check() {
+ cd "${pkgname}-${pkgname}-${pkgver}"
+ make check
+}
+
+package() {
+ cd "${pkgname}-${pkgname}-${pkgver}"
+ # make DESTDIR="${pkgdir}/" install
+ make -j1 DESTDIR="${pkgdir}/" install
+
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+ # Upstream expects lib389 and 389-ds-base to be shipped in the same package more or less
+ # so that's why it's not a split package.
+ cd src/lib389
+ python setup.py install --skip-build -O1 --root="${pkgdir}"
+ mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/
+ rmdir "${pkgdir}"/usr/sbin
+
+ install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+ install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+}
Copied: 389-ds-base/repos/staging-x86_64/bcf5e9f.patch (from rev 400739, 389-ds-base/trunk/bcf5e9f.patch)
===================================================================
--- staging-x86_64/bcf5e9f.patch (rev 0)
+++ staging-x86_64/bcf5e9f.patch 2020-11-13 09:11:08 UTC (rev 400740)
@@ -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
+
More information about the arch-commits
mailing list