diff --git a/0001-Added-option-to-use-libcrypto-instead-of-NSS.patch b/0001-Added-option-to-use-libcrypto-instead-of-NSS.patch index d1d728e..429adf0 100644 --- a/0001-Added-option-to-use-libcrypto-instead-of-NSS.patch +++ b/0001-Added-option-to-use-libcrypto-instead-of-NSS.patch @@ -1,7 +1,7 @@ From bf75a22ffc04dfa0387a1389750b0a1e6d3ac397 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 26 Mar 2010 15:04:51 +0100 -Subject: [PATCH 1/2] Added option to use libcrypto instead of NSS. +Subject: [PATCH] Added option to use libcrypto instead of NSS. crypto_sha512crypt.c is a clone of nss_sha512crypt.c with the exception that all usage of NSS and related libraries has been switched to libcrypto. @@ -447,5 +447,5 @@ index 0000000..5512c5d + const char *key, const char *salt, char **_hash); +int s3crypt_gen_salt(TALLOC_CTX *memctx, char **_salt); -- -1.6.4.2 +1.7.0.2 diff --git a/0002-Improvements-for-LDAP-Password-Policy-support.patch b/0002-Improvements-for-LDAP-Password-Policy-support.patch index 24992a3..c155afe 100644 --- a/0002-Improvements-for-LDAP-Password-Policy-support.patch +++ b/0002-Improvements-for-LDAP-Password-Policy-support.patch @@ -1,7 +1,7 @@ From 536c01cf9a04573c2351542fe00973e1538014a5 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 12 Mar 2010 10:54:40 +0100 -Subject: [PATCH 2/2] Improvements for LDAP Password Policy support +Subject: [PATCH] Improvements for LDAP Password Policy support Display warnings about remaining grace logins and password expiration to the user, when LDAP Password Policies are used. @@ -411,5 +411,5 @@ index 2edd158..f387265 100644 /** * @} -- -1.6.4.2 +1.7.0.2 diff --git a/0003-ldap-provider-ld-flags.patch b/0003-ldap-provider-ld-flags.patch new file mode 100644 index 0000000..087ae76 --- /dev/null +++ b/0003-ldap-provider-ld-flags.patch @@ -0,0 +1,29 @@ +From 840bb425fe0cb6f4904d5610ffd1fdfd9eed235d Mon Sep 17 00:00:00 2001 +From: Ralf Haferkamp +Date: Wed, 31 Mar 2010 10:40:13 +0200 +Subject: [PATCH] ldap provider ld flags + +The LDAP provider needs to be linked against libdhash +--- + src/Makefile.am | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 6d46cda..6f14eee 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -717,9 +717,11 @@ libsss_ldap_la_SOURCES = \ + util/sss_krb5.c + libsss_ldap_la_CFLAGS = \ + $(AM_CFLAGS) \ ++ $(DHASH_CFLAGS) \ + $(LDAP_CFLAGS) \ + $(KRB5_CFLAGS) + libsss_ldap_la_LIBADD = \ ++ $(DHASH_LIBS) \ + $(OPENLDAP_LIBS) \ + $(KRB5_LIBS) + libsss_ldap_la_LDFLAGS = \ +-- +1.7.0.2 + diff --git a/sssd.spec b/sssd.spec index 0026435..3747c44 100644 --- a/sssd.spec +++ b/sssd.spec @@ -27,6 +27,7 @@ URL: https://fedorahosted.org/sssd/ Source0: %{name}-%{version}.tar.gz Patch1: 0001-Added-option-to-use-libcrypto-instead-of-NSS.patch Patch2: 0002-Improvements-for-LDAP-Password-Policy-support.patch +Patch3: 0003-ldap-provider-ld-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define dhash_version 0.4.0 @@ -167,6 +168,7 @@ structure %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf