[arch-commits] Commit in sssd/repos/community-x86_64 (3 files)

Massimiliano Torromeo mtorromeo at archlinux.org
Tue May 25 09:23:28 UTC 2021


    Date: Tuesday, May 25, 2021 @ 09:23:28
  Author: mtorromeo
Revision: 945588

archrelease: copy trunk to community-x86_64

Added:
  sssd/repos/community-x86_64/PKGBUILD
    (from rev 945587, sssd/trunk/PKGBUILD)
  sssd/repos/community-x86_64/fix-py-tests.patch
    (from rev 945587, sssd/trunk/fix-py-tests.patch)
Deleted:
  sssd/repos/community-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |  242 +++++++++++++++++++++++++--------------------------
 fix-py-tests.patch |   39 ++++++++
 2 files changed, 161 insertions(+), 120 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-25 09:23:13 UTC (rev 945587)
+++ PKGBUILD	2021-05-25 09:23:28 UTC (rev 945588)
@@ -1,120 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Maintainer: Mantas M. <grawity at gmail.com>
-
-pkgname=sssd
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="System Security Services Daemon"
-arch=('x86_64')
-url="https://github.com/SSSD/sssd"
-license=('GPL3')
-depends=(
-  'bind'          # for nsupdate
-  'c-ares'
-  'cyrus-sasl-gssapi'
-  'ding-libs'
-  'libnl'
-  'libunistring'
-  'smbclient'     # for libndr-nbt
-  'nfsidmap'
-  'jansson'
-  'libtevent.so'
-  'libldb.so'
-)
-makedepends=(
-  'docbook-xsl'
-  'doxygen'
-  'python'
-  'samba'         # for libndr-nbt headers
-  'systemd'
-  'tevent'
-  'ldb'
-)
-checkdepends=(
-  'check'
-  'cmocka'
-  'libfaketime'
-  'openssh'
-  'softhsm'
-)
-backup=('etc/logrotate.d/sssd')
-source=("https://github.com/SSSD/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc})
-sha512sums=('871435cd82db38eef36988bae84a6d28220839ee16b600c3dab17523c18b295e65ff62e86c095ea67e652be661248b45720a5106e01179190ff3852b1c0e7a33'
-            'SKIP')
-validpgpkeys=('E4E366758CA0716AAB8048671EC6AB7532E7BC25'
-              '16F24229488E736048952737BA88000FE6398272'
-              '1A41DC67505F89A330828B66AFFE75DDE8508E12')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  for f in "${source[@]}"; do
-    f=$(basename "$f")
-    if [[ $f == *.patch ]]; then
-      patch -p1 < "$srcdir/$f"
-    fi
-  done
-
-  sed -i 's#/var/run/#/run/#' src/examples/logrotate
-
-  # Fix issue with autoconf 2.70+
-  sed '/AM_PROG_CC_C_O/ i AC_PROG_CPP' -i configure.ac
-
-  # dbus policy files in /usr/share/dbus-1
-  sed -i 's/^dbuspolicydir = $(sysconfdir)/dbuspolicydir = $(datadir)/' Makefile.in
-
-  # fix search path for libsofthsm2.so
-  # see: https://github.com/SSSD/sssd/issues/5329
-  sed -i 's#/usr/lib64/pkcs11/libsofthsm2.so ##' src/external/test_ca.m4
-
-  # remove flaky network test
-  sed '/fail_over-tests/d' -i Makefile.am
-  autoreconf -fiv
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr                                 \
-    --sbindir=/usr/bin                            \
-    --sysconfdir=/etc                             \
-    --localstatedir=/var                          \
-    --libexecdir=/usr/lib/sssd                    \
-    --datadir=/usr/share                          \
-    --enable-pammoddir=/usr/lib/security          \
-    --enable-pac-responder                        \
-    --with-initscript=systemd                     \
-    --with-os=fedora                              \
-    --with-pid-path=/run                          \
-    --without-python2-bindings                    \
-    --with-python3-bindings                       \
-    --with-syslog=journald                        \
-    --without-selinux                             \
-    --without-semanage                            \
-    --with-systemdunitdir=/usr/lib/systemd/system \
-    ;
-  sed -i '/\<HAVE_KRB5_SET_TRACE_CALLBACK\>/d' config.h
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 DESTDIR="$pkgdir/" install
-  rm -rf "$pkgdir"/etc/rc.d
-  rm -rf "$pkgdir"/lib
-  rm -rf "$pkgdir"/run
-  rm -f "$pkgdir"/usr/lib/ldb/modules/ldb/memberof.la
-  find "$pkgdir"/usr -depth -type d \
-    -exec rmdir --ignore-fail-on-non-empty {} \;
-
-  install -Dm0644 src/examples/logrotate "$pkgdir/etc/logrotate.d/sssd"
-
-  cd "$srcdir"
-  rm -rf "$pkgdir/etc/systemd" # remove the drop-in
-}
-
-# vim: ts=2:sw=2:et:nowrap

Copied: sssd/repos/community-x86_64/PKGBUILD (from rev 945587, sssd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-25 09:23:28 UTC (rev 945588)
@@ -0,0 +1,122 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Maintainer: Mantas M. <grawity at gmail.com>
+
+pkgname=sssd
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="System Security Services Daemon"
+arch=('x86_64')
+url="https://github.com/SSSD/sssd"
+license=('GPL3')
+depends=(
+  'bind'          # for nsupdate
+  'c-ares'
+  'cyrus-sasl-gssapi'
+  'ding-libs'
+  'libnl'
+  'libunistring'
+  'smbclient'     # for libndr-nbt
+  'nfsidmap'
+  'jansson'
+  'libtevent.so'
+  'libldb.so'
+)
+makedepends=(
+  'docbook-xsl'
+  'doxygen'
+  'python'
+  'samba'         # for libndr-nbt headers
+  'systemd'
+  'tevent'
+  'ldb'
+)
+checkdepends=(
+  'check'
+  'cmocka'
+  'libfaketime'
+  'openssh'
+  'softhsm'
+)
+backup=('etc/logrotate.d/sssd')
+source=("https://github.com/SSSD/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}
+        'fix-py-tests.patch')
+sha512sums=('80b5e81cedacdf0bbe724af20d69b918bb6cc353976c6c65421afcd5809d1723f523bc3c1be294b9e01cfda9617c2df5c6ceb007837f195eb1abc2abdab9858c'
+            'SKIP'
+            '7570e1e67d6d23654a6be0307a1e9e0595447473f9783a70be0df7c8902833bc7f35e296b5006c6ae1e684452cd6e26d61be5e3f561b481c50d6edafaafa0698')
+validpgpkeys=('E4E366758CA0716AAB8048671EC6AB7532E7BC25'
+              '16F24229488E736048952737BA88000FE6398272'
+              '1A41DC67505F89A330828B66AFFE75DDE8508E12')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  for f in "${source[@]}"; do
+    f=$(basename "$f")
+    if [[ $f == *.patch ]]; then
+      patch -p1 < "$srcdir/$f"
+    fi
+  done
+
+  sed -i 's#/var/run/#/run/#' src/examples/logrotate
+
+  # Fix issue with autoconf 2.70+
+  sed '/AM_PROG_CC_C_O/ i AC_PROG_CPP' -i configure.ac
+
+  # dbus policy files in /usr/share/dbus-1
+  sed -i 's/^dbuspolicydir = $(sysconfdir)/dbuspolicydir = $(datadir)/' Makefile.in
+
+  # fix search path for libsofthsm2.so
+  # see: https://github.com/SSSD/sssd/issues/5329
+  sed -i 's#/usr/lib64/pkcs11/libsofthsm2.so ##' src/external/test_ca.m4
+
+  # remove flaky network test
+  sed '/fail_over-tests/d' -i Makefile.am
+  autoreconf -fiv
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure \
+    --prefix=/usr                                 \
+    --sbindir=/usr/bin                            \
+    --sysconfdir=/etc                             \
+    --localstatedir=/var                          \
+    --libexecdir=/usr/lib/sssd                    \
+    --datadir=/usr/share                          \
+    --enable-pammoddir=/usr/lib/security          \
+    --enable-pac-responder                        \
+    --with-initscript=systemd                     \
+    --with-os=fedora                              \
+    --with-pid-path=/run                          \
+    --without-python2-bindings                    \
+    --with-python3-bindings                       \
+    --with-syslog=journald                        \
+    --without-selinux                             \
+    --without-semanage                            \
+    --with-systemdunitdir=/usr/lib/systemd/system \
+    ;
+  sed -i '/\<HAVE_KRB5_SET_TRACE_CALLBACK\>/d' config.h
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -j1 DESTDIR="$pkgdir/" install
+  rm -rf "$pkgdir"/etc/rc.d
+  rm -rf "$pkgdir"/lib
+  rm -rf "$pkgdir"/run
+  rm -f "$pkgdir"/usr/lib/ldb/modules/ldb/memberof.la
+  find "$pkgdir"/usr -depth -type d \
+    -exec rmdir --ignore-fail-on-non-empty {} \;
+
+  install -Dm0644 src/examples/logrotate "$pkgdir/etc/logrotate.d/sssd"
+
+  cd "$srcdir"
+  rm -rf "$pkgdir/etc/systemd" # remove the drop-in
+}
+
+# vim: ts=2:sw=2:et:nowrap

Copied: sssd/repos/community-x86_64/fix-py-tests.patch (from rev 945587, sssd/trunk/fix-py-tests.patch)
===================================================================
--- fix-py-tests.patch	                        (rev 0)
+++ fix-py-tests.patch	2021-05-25 09:23:28 UTC (rev 945588)
@@ -0,0 +1,39 @@
+diff --git a/src/tests/pyhbac-test.py b/src/tests/pyhbac-test.py
+index 06163afc5..a0775d452 100755
+--- a/src/tests/pyhbac-test.py
++++ b/src/tests/pyhbac-test.py
+@@ -27,7 +27,7 @@ import copy
+ import tempfile
+ 
+ BUILD_DIR = os.getenv('builddir') or "."
+-TEST_DIR = os.getenv('SSS_TEST_DIR') or "."
++TEST_DIR = os.path.abspath(os.getenv('SSS_TEST_DIR') or ".")
+ MODPATH = tempfile.mkdtemp(prefix="tp_pyhbac_", dir=TEST_DIR)
+ 
+ 
+diff --git a/src/tests/pysss-test.py b/src/tests/pysss-test.py
+index 30bc074ab..9ecaed9ec 100755
+--- a/src/tests/pysss-test.py
++++ b/src/tests/pysss-test.py
+@@ -26,7 +26,7 @@ import os
+ import tempfile
+ 
+ BUILD_DIR = os.getenv('builddir') or "."
+-TEST_DIR = os.getenv('SSS_TEST_DIR') or "."
++TEST_DIR = os.path.abspath(os.getenv('SSS_TEST_DIR') or ".")
+ MODPATH = tempfile.mkdtemp(prefix="tp_pysss_", dir=TEST_DIR)
+ 
+ 
+diff --git a/src/tests/pysss_murmur-test.py b/src/tests/pysss_murmur-test.py
+index 531f8b55f..89d5077b7 100755
+--- a/src/tests/pysss_murmur-test.py
++++ b/src/tests/pysss_murmur-test.py
+@@ -25,7 +25,7 @@ import os
+ import tempfile
+ 
+ BUILD_DIR = os.getenv('builddir') or "."
+-TEST_DIR = os.getenv('SSS_TEST_DIR') or "."
++TEST_DIR = os.path.abspath(os.getenv('SSS_TEST_DIR') or ".")
+ MODPATH = tempfile.mkdtemp(prefix="tp_pysss_murmur_", dir=TEST_DIR)
+ 
+ 



More information about the arch-commits mailing list