testing/sssd: dev & openrc subpackages

add check()

Note: only partial test suite is run, the full testsuite fails

Only build on x86_64 for now

2 files changed, 76 insertions, 56 deletions

diff --git a/testing/sssd/0001-makefile.patch b/testing/sssd/0001-makefile.patch
index 5b80e74f0b..49c1e55409 100644
--- a/testing/sssd/0001-makefile.patch
+++ b/testing/sssd/0001-makefile.patch
@@ -8,7 +8,23 @@
      $(POPT_CFLAGS) \
      $(TALLOC_CFLAGS) \
      $(TDB_CFLAGS) \
-@@ -2511,6 +2512,7 @@
+@@ -891,6 +892,7 @@
+     $(TEVENT_LIBS) \
+     $(DHASH_LIBS) \
+     libsss_debug.la \
++    -lintl \
+     $(NULL)
+ libsss_child_la_LDFLAGS = -avoid-version
+ 
+@@ -1856,6 +1858,7 @@
+     $(TALLOC_LIBS) \
+     $(TEVENT_LIBS) \
+     $(LDB_LIBS) \
++    -lintl \
+     $(NULL)
+ 
+ if HAVE_CHECK
+@@ -2511,6 +2514,7 @@
      $(POPT_LIBS) \
      libsss_test_common.la \
      libsss_debug.la \
@@ -16,7 +32,7 @@
      $(NULL)
  
  sss_nss_idmap_tests_SOURCES = \
-@@ -4053,7 +4055,8 @@
+@@ -4053,7 +4057,8 @@
      $(TALLOC_LIBS) \
      $(POPT_LIBS) \
      $(DHASH_LIBS) \
@@ -26,7 +42,7 @@
  
  if BUILD_SEMANAGE
  selinux_child_SOURCES = \
-@@ -4127,6 +4130,7 @@
+@@ -4127,6 +4132,7 @@
      $(POPT_LIBS) \
      $(NSS_LIBS) \
      libsss_crypt.la \
diff --git a/testing/sssd/APKBUILD b/testing/sssd/APKBUILD
index 4acae9cbb9..513bcbfe02 100644
--- a/testing/sssd/APKBUILD
+++ b/testing/sssd/APKBUILD
@@ -5,67 +5,71 @@ pkgver=1.15.3
 pkgrel=0
 pkgdesc="System Security Services Daemon"
 url="https://pagure.io/SSSD/sssd"
-arch="all"
-license="GPL3"
-depends="bind \
-	c-ares \
-	curl \
-	cyrus-sasl-gssapi \
-	ding-libs \
-	http-parser \
-	jansson \
-	libnl \
-	libunistring \
-	nss \
+arch="x86_64"
+license="GPL-3.0"
+
+# TODO: the full test suite depends on these
+#	but does not pass.
+#checkdepends="
+#	check-dev
+#	cmocka-dev
+#	"
+
+depends="
+	bind
+	curl
+	cyrus-sasl-gssapi
 	"
-makedepends="autoconf \
-	gettext-dev \
-	automake \
-	libtool \
-	popt-dev \
-	talloc-dev \
-	tdb-dev \
-	tevent-dev \
-	cmocka \
-	ldb-dev \
-	ding-libs \
-	linux-pam-dev \
-	pcre-dev \
-	c-ares-dev \
-	bind-tools \
-	http-parser-dev \
-	curl-dev \
-	jansson-dev \
-	glib-dev \
-	dbus-dev \
-	libxslt \
-	libxml2-utils \
-	docbook-xsl \
-	python2-dev \
-	python3-dev \
-	nss-dev \
-	openldap-dev \
-	krb5-dev \
-        keyutils-dev \
-	check \
+makedepends="
+	autoconf
+	gettext-dev
+	automake
+	libtool
+	popt-dev
+	talloc-dev
+	tdb-dev
+	tevent-dev
+	ldb-dev
+	ding-libs-dev
+	linux-pam-dev
+	pcre-dev
+	c-ares-dev
+	bind-tools
+	http-parser-dev
+	curl-dev
+	jansson-dev
+	glib-dev
+	dbus-dev
+	libxslt
+	libxml2-utils
+	docbook-xsl
+	python2-dev
+	python3-dev
+	nss-dev
+	openldap-dev
+	krb5-dev
+	keyutils-dev
 	"
 install=""
-subpackages=""
-source="https://releases.pagure.org/SSSD/$pkgname/$pkgname-$pkgver.tar.gz \
-	0001-makefile.patch \
-	0002-src.patch \
-	0003-alpine.patch \
-	nss.h cifsidmap.h "
+subpackages="$pkgname-dev $pkgname-openrc"
+source="https://releases.pagure.org/SSSD/$pkgname/$pkgname-$pkgver.tar.gz
+	0001-makefile.patch
+	0002-src.patch
+	0003-alpine.patch
+	nss.h
+	cifsidmap.h
+	"
 builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
-	default_prepare	
+	default_prepare
+	cd "$builddir"
+	cp $srcdir/nss.h $srcdir/cifsidmap.h $builddir/src/
+	autoreconf -i
 }
 
 build() {
 	cd "$builddir"
-	cp $srcdir/nss.h $srcdir/cifsidmap.h $builddir/src/
-	autoreconf -i
 	./configure \
 		--prefix=/usr \
 		--exec-prefix=/usr/sbin \
@@ -83,7 +87,6 @@ build() {
 		--without-semanage \
 		--without-autofs \
 		--without-ssh \
-		--without-sudo \
 		--without-samba \
 		--without-nfsv4-idmapd-plugin \
 		--without-manpages \
@@ -94,6 +97,7 @@ build() {
 
 check() {
 	cd "$builddir"
+	make check
 }
 
 package() {
@@ -107,7 +111,7 @@ package() {
 }
 
 sha512sums="92478205ee1b1cebc3d35b733576180db51cee8cc84d0c2cb78386924ffa90ae355b6ad9b7b51e5e5f5a7a4588764d1c7afb0673c035b1fe9b1a283beb79a428  sssd-1.15.3.tar.gz
-4e5c44bb686144178522a35db85c6eb8979a3dcb328296828e11c9cc84beaa63649ed9402f07d09cee40cc550ab5b768902758c0eb292cc3569a59f9d5ab5ca8  0001-makefile.patch
+d0f30b6a372d3ca9705e9621f6bc4dc473a381a719b2158ad66195d0037ae1661d2832c3ec7755e200070b8de2e0ddbf77da36d2f25bcfa6e0e352d08662db37  0001-makefile.patch
 70284f0820e958c1c091d554cb2dd302f210935fb191deb71af510c52c402d52298143e05dfa161eecf89885d3c2569a4a0c536480971becd4d50a7d5adf3ffa  0002-src.patch
 300c1f6750054f61201e0952642f533aa5f572c208fc4f8317b89ec6731734680bf771bd37664e5f907fb30a713ace4b26aad9b6da2245a5cc10f9f0af878246  0003-alpine.patch
 5abb1ffd1302eaa25736404ae148c0ffdeb7ce42fa2745be3436e887a2aa96b9620287f19b2790cb59cbccc2c04a9dee1adec4fa8e813d322cde82793500e33b  nss.h