Date: Wednesday, July 14, 2021 @ 19:17:44 Author: mtorromeo Revision: 977112
archrelease: copy trunk to community-x86_64 Added: sssd/repos/community-x86_64/PKGBUILD (from rev 977111, sssd/trunk/PKGBUILD) sssd/repos/community-x86_64/fix-py-tests.patch (from rev 977111, sssd/trunk/fix-py-tests.patch) Deleted: sssd/repos/community-x86_64/PKGBUILD sssd/repos/community-x86_64/fix-py-tests.patch --------------------+ PKGBUILD | 244 +++++++++++++++++++++++++-------------------------- fix-py-tests.patch | 78 ++++++++-------- 2 files changed, 161 insertions(+), 161 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-07-14 19:17:36 UTC (rev 977111) +++ PKGBUILD 2021-07-14 19:17:44 UTC (rev 977112) @@ -1,122 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Maintainer: Mantas M. <graw...@gmail.com> - -pkgname=sssd -pkgver=2.5.1 -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=('7441df3b5f1cc1eadb0c6853b048d780ecb36761876aaeb26b9a2d87729211d3ceeae01085dc3ec4fd1c5328f951c8abe854b1d01d91fae25466f930fe16e44a' - '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/PKGBUILD (from rev 977111, sssd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-07-14 19:17:44 UTC (rev 977112) @@ -0,0 +1,122 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Maintainer: Mantas M. <graw...@gmail.com> + +pkgname=sssd +pkgver=2.5.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} + 'fix-py-tests.patch') +sha512sums=('a9bac7b2cc23022dce3bcda314c9c26a0a0914c448f6d5a51c5ba18670f04c1fd1a94cb20173235b6285df1dcc9251cb6b3f3e71a220037b4eb66668e6f33c48' + '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 Deleted: fix-py-tests.patch =================================================================== --- fix-py-tests.patch 2021-07-14 19:17:36 UTC (rev 977111) +++ fix-py-tests.patch 2021-07-14 19:17:44 UTC (rev 977112) @@ -1,39 +0,0 @@ -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) - - Copied: sssd/repos/community-x86_64/fix-py-tests.patch (from rev 977111, sssd/trunk/fix-py-tests.patch) =================================================================== --- fix-py-tests.patch (rev 0) +++ fix-py-tests.patch 2021-07-14 19:17:44 UTC (rev 977112) @@ -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) + +