From 93a5e814d286de893bfe300b26258966e261080d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 18 Sep 2020 10:35:36 -0400 Subject: [PATCH] sssd: update to 2.3.1; drop sssd-python --- common/shlibs | 3 +-- srcpkgs/sssd-python | 1 - srcpkgs/sssd/patches/libressl.patch | 18 ++++++++++++++++++ srcpkgs/sssd/template | 27 ++++++++++----------------- srcpkgs/sssd/update | 1 + 5 files changed, 30 insertions(+), 20 deletions(-) delete mode 120000 srcpkgs/sssd-python create mode 100644 srcpkgs/sssd/patches/libressl.patch create mode 100644 srcpkgs/sssd/update diff --git a/common/shlibs b/common/shlibs index 1bd87ad9f22..61d1390b69c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2791,11 +2791,10 @@ libbasicobjects.so.0 ding-libs-0.5.0_1 libini_config.so.5 ding-libs-0.5.0_1 libipa_hbac.so.0 sssd-1.13.4_1 libsss_idmap.so.0 sssd-1.13.4_1 -libsss_sudo.so sssd-1.13.4_1 libnss_sss.so.2 sssd-1.13.4_1 -libwbclient.so.0 sssd-1.13.4_1 libsss_nss_idmap.so.0 sssd-1.13.4_1 libsss_simpleifp.so.0 sssd-1.13.4_1 +libsss_certmap.so.0 sssd-2.2.3_1 libsss_util.so sssd-2.0.0_1 libsss_crypt.so sssd-2.0.0_1 libsss_debug.so sssd-2.0.0_1 diff --git a/srcpkgs/sssd-python b/srcpkgs/sssd-python deleted file mode 120000 index db45fa856de..00000000000 --- a/srcpkgs/sssd-python +++ /dev/null @@ -1 +0,0 @@ -sssd \ No newline at end of file diff --git a/srcpkgs/sssd/patches/libressl.patch b/srcpkgs/sssd/patches/libressl.patch new file mode 100644 index 00000000000..8c3a3aa18d8 --- /dev/null +++ b/srcpkgs/sssd/patches/libressl.patch @@ -0,0 +1,18 @@ +diff -Naurp0 a/lib/certmap/sss_cert_content_crypto.c b/lib/certmap/sss_cert_content_crypto.c +--- src/lib/certmap/sss_cert_content_crypto.c 2020-09-06 16:39:47.669132066 +0200 ++++ src/lib/certmap/sss_cert_content_crypto.c 2020-09-06 16:39:51.923060279 +0200 +@@ -774,2 +774,2 @@ int sss_cert_get_content(TALLOC_CTX *mem +- if ((X509_get_extension_flags(cert) & EXFLAG_KUSAGE)) { +- cont->key_usage = X509_get_key_usage(cert); ++ if (cert->ex_flags & EXFLAG_KUSAGE) { ++ cont->key_usage = cert->ex_kusage; +diff -Naurp0 a/p11_child/p11_child_openssl.c b/p11_child/p11_child_openssl.c +--- src/p11_child/p11_child_openssl.c 2020-09-06 16:39:47.663132167 +0200 ++++ src/p11_child/p11_child_openssl.c 2020-09-06 16:39:51.887060887 +0200 +@@ -33,0 +34 @@ ++#include +diff -Naurp0 a/util/crypto/libcrypto/crypto_hmac_sha1.c b/util/crypto/libcrypto/crypto_hmac_sha1.c +--- src/util/crypto/libcrypto/crypto_hmac_sha1.c 2020-09-06 16:39:47.705131458 +0200 ++++ src/util/crypto/libcrypto/crypto_hmac_sha1.c 2020-09-06 16:39:51.870061174 +0200 +@@ -19,0 +20 @@ ++#include diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template index 0cf90a86808..57a7fc7e2b4 100644 --- a/srcpkgs/sssd/template +++ b/srcpkgs/sssd/template @@ -1,16 +1,16 @@ # Template file for 'sssd' pkgname=sssd -version=2.0.0 -revision=4 +version=2.3.1 +revision=1 build_style=gnu-configure -configure_args="--without-selinux --without-semanage +configure_args="--without-selinux --without-semanage --without-libwbclient --disable-cifs-idmap-plugin --without-samba --with-os=fedora - --with-test-dir=/dev/shm --with-python2-bindings --with-python3-bindings - --with-pid-path=/run" + --with-test-dir=/dev/shm --with-python3-bindings --with-pid-path=/run + --with-sudo-lib-path=/usr/lib/sssd --without-python2-bindings" hostmakedepends="pkg-config nscd bind xmlcatmgr docbook-xsl" makedepends="pam-devel popt-devel talloc-devel tdb-devel tevent-devel ldb-devel ding-libs-devel libldap-devel mit-krb5-devel c-ares-devel glib-devel - libxslt-devel python-devel nss-devel libnfsidmap-devel http-parser-devel + libxslt-devel nss-devel libnfsidmap-devel http-parser-devel p11-kit-devel jansson-devel python3-devel libcurl-devel cmocka-devel check-devel" make_dirs="/var/lib/sss/db 0700 root root /var/lib/sss/secrets 0700 root root @@ -25,9 +25,9 @@ make_dirs="/var/lib/sss/db 0700 root root short_desc="System Security Services Daemon" maintainer="Yuusha Spacewolf " license="GPL-3.0-or-later" -homepage="https://pagure.io/SSSD/sssd/" -distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz" -checksum=77569d00dd516e7eba1bfcc2ae562647068d7d16e283e8b3fc4f1e03fc899586 +homepage="https://sssd.io" +distfiles="https://github.com/SSSD/sssd/releases/download/${pkgname}-${version//./_}/${pkgname}-${version}.tar.gz" +checksum=ef8b047e6d0452a585862dffd16db725ac828e0d3fb594a8dea6d2f24a61ad17 python_version=3 do_check() { @@ -46,19 +46,12 @@ sssd-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig vmove usr/include } } -sssd-python_package() { - depends="sssd" - short_desc+=" - Python bindings" - pkg_install() { - vmove /usr/lib/python2.7 - } -} - sssd-python3_package() { depends="sssd" short_desc+=" - Python3 bindings" diff --git a/srcpkgs/sssd/update b/srcpkgs/sssd/update new file mode 100644 index 00000000000..ca35d5fb766 --- /dev/null +++ b/srcpkgs/sssd/update @@ -0,0 +1 @@ +pattern="${pkgname}-\K[0-9_.]+(?=tar.gz)"