[arch-commits] Commit in 389-ds-base/repos/extra-x86_64 (8 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Tue May 26 00:13:27 UTC 2020


    Date: Tuesday, May 26, 2020 @ 00:13:24
  Author: svenstaro
Revision: 387536

archrelease: copy trunk to extra-x86_64

Added:
  389-ds-base/repos/extra-x86_64/389-ds-base.sysusers
    (from rev 387535, 389-ds-base/trunk/389-ds-base.sysusers)
  389-ds-base/repos/extra-x86_64/389-ds-base.tmpfiles
    (from rev 387535, 389-ds-base/trunk/389-ds-base.tmpfiles)
  389-ds-base/repos/extra-x86_64/PKGBUILD
    (from rev 387535, 389-ds-base/trunk/PKGBUILD)
  389-ds-base/repos/extra-x86_64/bcf5e9f.patch
    (from rev 387535, 389-ds-base/trunk/bcf5e9f.patch)
Deleted:
  389-ds-base/repos/extra-x86_64/389-ds-base.sysusers
  389-ds-base/repos/extra-x86_64/389-ds-base.tmpfiles
  389-ds-base/repos/extra-x86_64/PKGBUILD
  389-ds-base/repos/extra-x86_64/bcf5e9f.patch

----------------------+
 389-ds-base.sysusers |    2 
 389-ds-base.tmpfiles |    4 -
 PKGBUILD             |  186 ++++++++++++++++++++++++-------------------------
 bcf5e9f.patch        |   82 ++++++++++-----------
 4 files changed, 137 insertions(+), 137 deletions(-)

Deleted: 389-ds-base.sysusers
===================================================================
--- 389-ds-base.sysusers	2020-05-26 00:13:10 UTC (rev 387535)
+++ 389-ds-base.sysusers	2020-05-26 00:13:24 UTC (rev 387536)
@@ -1 +0,0 @@
-u dirsrv   440      "389 Directory Server" /var/lib/389-ds-base

Copied: 389-ds-base/repos/extra-x86_64/389-ds-base.sysusers (from rev 387535, 389-ds-base/trunk/389-ds-base.sysusers)
===================================================================
--- 389-ds-base.sysusers	                        (rev 0)
+++ 389-ds-base.sysusers	2020-05-26 00:13:24 UTC (rev 387536)
@@ -0,0 +1 @@
+u dirsrv   440      "389 Directory Server" /var/lib/389-ds-base

Deleted: 389-ds-base.tmpfiles
===================================================================
--- 389-ds-base.tmpfiles	2020-05-26 00:13:10 UTC (rev 387535)
+++ 389-ds-base.tmpfiles	2020-05-26 00:13:24 UTC (rev 387536)
@@ -1,2 +0,0 @@
-d /var/log/dirsrv 0700 dirsrv dirsrv -
-d /var/lib/dirsrv 0700 dirsrv dirsrv -

Copied: 389-ds-base/repos/extra-x86_64/389-ds-base.tmpfiles (from rev 387535, 389-ds-base/trunk/389-ds-base.tmpfiles)
===================================================================
--- 389-ds-base.tmpfiles	                        (rev 0)
+++ 389-ds-base.tmpfiles	2020-05-26 00:13:24 UTC (rev 387536)
@@ -0,0 +1,2 @@
+d /var/log/dirsrv 0700 dirsrv dirsrv -
+d /var/lib/dirsrv 0700 dirsrv dirsrv -

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-26 00:13:10 UTC (rev 387535)
+++ PKGBUILD	2020-05-26 00:13:24 UTC (rev 387536)
@@ -1,93 +0,0 @@
-# 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.2
-pkgdesc="389 Directory Server (base)"
-pkgrel=3
-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=('libevent' 'nspr' 'nss' 'net-snmp' 'pam' 'openldap' 'python-argcomplete' 'python-dateutil' 'python-ldap' 'perl')
-makedepends=('cargo' 'rsync' 'doxygen' 'cmocka' 'python-setuptools' 'python-argparse-manpage' 'npm')
-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=('f9ccba241cb0b8cd7b8a3a6fe4b661941247fb9aaeac4c8e1d674a4534d617b5ae12abef7977c8ccd2f5b1beefba52e5881a7011be634d1062741f35ec150733'
-            '8689b60f13517e6541e1faa62e61781654a8e4678990d14a3fe0cfe4673697cdde1c46763fdc7ef6203e4026286fa004c73b2857fd7fecff69483e6d1e8e6d68'
-            '5dff695ae866a591a711f836f2f72f2005b4afdb20760cda8711791910299e2c6ec71dff5eca9a2d9832cad8f9e9904dbbcf2d314cd9b20432bc8fd05c097868')
-
-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/extra-x86_64/PKGBUILD (from rev 387535, 389-ds-base/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-26 00:13:24 UTC (rev 387536)
@@ -0,0 +1,93 @@
+# 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.2
+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=('libevent' 'nspr' 'nss' 'net-snmp' 'pam' 'openldap' 'python-argcomplete' 'python-dateutil' 'python-ldap' 'perl' 'python-packaging')
+makedepends=('cargo' 'rsync' 'doxygen' 'cmocka' 'python-setuptools' 'python-argparse-manpage' 'npm')
+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=('f9ccba241cb0b8cd7b8a3a6fe4b661941247fb9aaeac4c8e1d674a4534d617b5ae12abef7977c8ccd2f5b1beefba52e5881a7011be634d1062741f35ec150733'
+            '8689b60f13517e6541e1faa62e61781654a8e4678990d14a3fe0cfe4673697cdde1c46763fdc7ef6203e4026286fa004c73b2857fd7fecff69483e6d1e8e6d68'
+            '5dff695ae866a591a711f836f2f72f2005b4afdb20760cda8711791910299e2c6ec71dff5eca9a2d9832cad8f9e9904dbbcf2d314cd9b20432bc8fd05c097868')
+
+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"
+}

Deleted: bcf5e9f.patch
===================================================================
--- bcf5e9f.patch	2020-05-26 00:13:10 UTC (rev 387535)
+++ bcf5e9f.patch	2020-05-26 00:13:24 UTC (rev 387536)
@@ -1,41 +0,0 @@
-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
-

Copied: 389-ds-base/repos/extra-x86_64/bcf5e9f.patch (from rev 387535, 389-ds-base/trunk/bcf5e9f.patch)
===================================================================
--- bcf5e9f.patch	                        (rev 0)
+++ bcf5e9f.patch	2020-05-26 00:13:24 UTC (rev 387536)
@@ -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