[Pkg-sssd-devel] [Git][sssd-team/sssd][master] 7 commits: debian/control: Mark test packages as <!nocheck>
Timo Aaltonen
gitlab at salsa.debian.org
Tue Jan 12 15:23:04 GMT 2021
Timo Aaltonen pushed to branch master at Debian SSSD packaging / sssd
Commits:
3fb4a344 by Marco Trevisan (Treviño) at 2020-12-16T15:49:30+01:00
debian/control: Mark test packages as <!nocheck>
- - - - -
0c12c246 by Marco Trevisan (Treviño) at 2020-12-16T15:51:46+01:00
debian/rules: Don't run tests if nocheck is set
- - - - -
10969a29 by Marco Trevisan (Treviño) at 2020-12-16T17:49:56+01:00
debian/control: Add missing test dependencies
- - - - -
3b2ba3c2 by Marco Trevisan (Treviño) at 2020-12-16T19:04:01+01:00
debian/patches: Get libsofthsm2 from right path for each architecture
- - - - -
997edf30 by Marco Trevisan (Treviño) at 2020-12-16T19:04:01+01:00
debian/rules: Enable tests again
- - - - -
c56c71f7 by Marco Trevisan (Treviño) at 2020-12-16T19:04:01+01:00
debian/control: Enable libcmocka (and so unit tests) all the archs
- - - - -
33e94cc5 by Marco Trevisan (Treviño) at 2020-12-16T19:04:01+01:00
debian/changelog: Update
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/test_ca-Look-for-libsofthsm2-in-libdir-before-falling-bac.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+sssd (2.4.0-2) UNRELEASED; urgency=medium
+
+ * debian/control: Mark test packages as <!nocheck>
+ - Add missing test dependencies
+ - Enable libcmocka (and so unit tests) all the archs
+ * debian/rules:
+ - Don't run tests if nocheck is set
+ - Enable tests again
+ * debian/patches:
+ - Get libsofthsm2 from right path for each architecture
+
+ -- Marco Trevisan (Treviño) <marco at ubuntu.com> Wed, 16 Dec 2020 17:50:24 +0100
+
sssd (2.4.0-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders: Timo Aaltonen <tjaalton at debian.org>,
Dominik George <natureshadow at debian.org>
Build-Depends:
autopoint,
- check,
+ check <!nocheck>,
cifs-utils,
debhelper-compat (= 12),
dh-apparmor,
@@ -15,11 +15,13 @@ Build-Depends:
docbook-xml,
docbook-xsl,
dpkg-dev (>= 1.16.1~),
+ faketime <!nocheck>,
+ gnutls-bin <!nocheck>,
krb5-config,
ldap-utils,
libaugeas-dev,
libc-ares-dev,
- libcmocka-dev [amd64 armhf i386],
+ libcmocka-dev <!nocheck>,
libcollection-dev,
libdbus-1-dev,
libdhash-dev,
@@ -35,7 +37,9 @@ Build-Depends:
libnfsidmap-dev,
libnl-3-dev [linux-any],
libnl-route-3-dev [linux-any],
+ libnss-wrapper <!nocheck>,
libp11-kit-dev,
+ libpam-wrapper <!nocheck>,
libpam0g-dev | libpam-dev,
libpcre3-dev,
libpopt-dev,
@@ -43,18 +47,20 @@ Build-Depends:
libselinux1-dev [linux-any],
libsemanage1-dev [linux-any],
libsmbclient-dev,
- libsofthsm2,
libssl-dev,
libsystemd-dev [linux-any],
libtalloc-dev,
libtdb-dev,
libtevent-dev,
- libuid-wrapper,
+ libuid-wrapper <!nocheck>,
libxml2-utils,
lsb-release,
+ openssh-client <!nocheck>,
+ openssl <!nocheck>,
python3-dev,
python3-setuptools,
samba-dev (>= 2:4.1.13),
+ softhsm2 <!nocheck>,
systemd,
systemtap-sdt-dev,
uuid-dev,
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
fix-whitespace-test.diff
default-to-socket-activated-services.diff
+test_ca-Look-for-libsofthsm2-in-libdir-before-falling-bac.patch
=====================================
debian/patches/test_ca-Look-for-libsofthsm2-in-libdir-before-falling-bac.patch
=====================================
@@ -0,0 +1,36 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail at 3v1n0.net>
+Date: Wed, 16 Dec 2020 18:19:00 +0100
+Subject: test_ca: Look for libsofthsm2 in libdir before falling back to
+ hardcoded paths
+
+Right now building SSSD in archs different from amd64 (at least in
+debian and derivatives) won't ever get the test_CA built because
+libsofthsm2 won't be found (leading also to #5397 at times).
+
+As per this, until they won't provide a pkg-config file:
+ - Prioritize looking for libsofthsm2 in configured libdir (will help
+ the developer case when using custom prefixes with custom softhsm2)
+ - Fallback to /usr prefixes, supporting any arch (not only x86_64)
+
+Origin: https://github.com/SSSD/sssd/pull/5438
+---
+ src/external/test_ca.m4 | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/test_ca.m4 b/src/external/test_ca.m4
+index 4d45a5a..7f996f3 100644
+--- a/src/external/test_ca.m4
++++ b/src/external/test_ca.m4
+@@ -33,7 +33,11 @@ AC_DEFUN([AM_CHECK_TEST_CA],
+ AM_CONDITIONAL([BUILD_TEST_CA], [test -x "$OPENSSL" -a -x "$SSH_KEYGEN" -a -x "$CERTUTIL" -a -x "$PK12UTIL"])
+ else
+
+- for p in /usr/lib64/pkcs11/libsofthsm2.so /usr/lib/pkcs11/libsofthsm2.so /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so; do
++ for p in "$(eval echo ${libdir})"/pkcs11/libsofthsm2.so \
++ "$(eval echo ${libdir})"/softhsm/libsofthsm2.so \
++ /usr/lib*/pkcs11/libsofthsm2.so \
++ /usr/lib/*-linux-gnu*/softhsm/libsofthsm2.so \
++ /usr/lib/softhsm/libsofthsm2.so; do
+ if test -f "${p}"; then
+ SOFTHSM2_PATH="${p}"
+ break;
=====================================
debian/rules
=====================================
@@ -47,9 +47,11 @@ override_dh_auto_configure:
--with-sudo
override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
export CK_TIMEOUT_MULTIPLIER=10
-# dh_auto_test -- VERBOSE=yes
+ dh_auto_test -- VERBOSE=yes
unset CK_TIMEOUT_MULTIPLIER
+endif
override_dh_auto_install:
dh_auto_install --max-parallel=1
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/baa83e17187ddcfcb8691bb586e79fba419e0a87...33e94cc5761b1448dcb027884dee03d65d29ea13
--
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/baa83e17187ddcfcb8691bb586e79fba419e0a87...33e94cc5761b1448dcb027884dee03d65d29ea13
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-sssd-devel/attachments/20210112/94de1fab/attachment-0001.html>
More information about the Pkg-sssd-devel
mailing list