Accepting request 120747 from network:ldap

- Update to new upstream release 1.8.3
* LDAP: Handle situations where the RootDSE is not available
  anonymously
* LDAP: Fix regression for users using non-standard LDAP attributes
  for user information
- Switch from openssl to mozilla-nss, as this is the officially
  supported crypto integration (forwarded request 120746 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/120747
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sssd?expand=0&rev=36

0004-avoid-hard-crypto-dep.diff

@@ -1,40 +0,0 @@
-From: Jan Engelhardt <jengelh@medozas.de>
-Date: 2012-03-11 21:45:34.708782973 +0100
-
-build: restore libcrypto support in the autotools files.
-
-References: https://bugzilla.redhat.com/show_bug.cgi?id=802169
-
----
- configure.ac           |    1 +
- src/external/crypto.m4 |    4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-Index: sssd-1.8.0/configure.ac
-===================================================================
---- sssd-1.8.0.orig/configure.ac
-+++ sssd-1.8.0/configure.ac
-@@ -210,6 +210,7 @@ if test x$HAVE_SYSTEMD_UNIT != x; then
- fi
- 
- AM_CHECK_NSS
-+AM_CHECK_LIBCRYPTO
- AM_CONDITIONAL([HAVE_NSS], [test x"$NSS_CFLAGS" != x])
- 
- AC_CHECK_HEADERS([sys/inotify.h])
-Index: sssd-1.8.0/src/external/crypto.m4
-===================================================================
---- sssd-1.8.0.orig/src/external/crypto.m4
-+++ sssd-1.8.0/src/external/crypto.m4
-@@ -1,9 +1,9 @@
- AC_DEFUN([AM_CHECK_NSS],
--         [PKG_CHECK_MODULES([NSS],[nss])
-+         [PKG_CHECK_MODULES([NSS],[nss],[:],[:])
-           AC_DEFINE_UNQUOTED(HAVE_NSS, 1, [Build with NSS crypto back end])
- ])
- 
- AC_DEFUN([AM_CHECK_LIBCRYPTO],
--         [PKG_CHECK_MODULES([CRYPTO],[libcrypto])
-+         [PKG_CHECK_MODULES([CRYPTO],[libcrypto],[:],[:])
-           AC_DEFINE_UNQUOTED(HAVE_LIBCRYPTO, 1, [Build with libcrypt crypto back end])
- ])

libdl.diff

@@ -0,0 +1,29 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2012-05-11 19:34:50.087905211 +0200
+
+build: resolve link failure
+
+libtool: link: gcc -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -fno-strict-aliasing -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wl,--version-script -Wl,./src/providers/sssd_be.exports -o sssd_be src/providers/data_provider_be.o src/providers/data_provider_fo.o src/providers/data_provider_opts.o src/providers/data_provider_callbacks.o src/providers/fail_over.o src/resolv/async_resolv.o -Wl,--export-dynamic  -lpam -lcares ./.libs/libsss_util.a -ltevent -ltalloc -lpopt -lldb -ldbus-1 -lpcre -lini_config -lcollection -ldhash -llber -lldap -ltdb -lunistring -lcrypto
+/usr/lib64/gcc/x86_64-suse-linux/4.7/../../../../x86_64-suse-linux/bin/ld: src/providers/data_provider_be.o: undefined reference to symbol 'dlsym@@GLIBC_2.2.5'
+/usr/lib64/gcc/x86_64-suse-linux/4.7/../../../../x86_64-suse-linux/bin/ld: note: 'dlsym@@GLIBC_2.2.5' is defined in DSO /lib64/libdl.so.2 so try adding it to the linker command line
+/lib64/libdl.so.2: could not read symbols: Invalid operation
+collect2: error: ld returned 1 exit status
+make[2]: *** [sssd_be] Error 1
+
+---
+ Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: sssd-1.8.3/Makefile.am
+===================================================================
+--- sssd-1.8.3.orig/Makefile.am
++++ sssd-1.8.3/Makefile.am
+@@ -547,7 +547,7 @@ sssd_be_SOURCES = \
+     src/providers/data_provider_callbacks.c \
+     $(SSSD_FAILOVER_OBJ)
+ sssd_be_LDADD = \
+-    $(SSSD_LIBS) \
++    -ldl $(SSSD_LIBS) \
+     $(CARES_LIBS) \
+     libsss_util.la
+ sssd_be_LDFLAGS = \

sssd-1.8.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59231dbe76f53b4d2ae026419940c5afceb3307a221648226bc661ce8b871575
-size 2128880

sssd-1.8.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75ca9465db5816804fe58e250450cb08867e1d1d8557c21ca731230cd80747e3
+size 2156262

sssd-1.8.3.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEABECAAYFAk+iz+UACgkQeiVVYja6o6MakgCeJ8poAGhQPPOTFGFQcr3sCHI/
+sv0An2lI/FR2R4+6iltEeaXZCqdvbetY
+=iKbt
+-----END PGP SIGNATURE-----

sssd.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu May 10 04:22:47 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 1.8.3
+* LDAP: Handle situations where the RootDSE is not available
+  anonymously
+* LDAP: Fix regression for users using non-standard LDAP attributes
+  for user information
+- Switch from openssl to mozilla-nss, as this is the officially
+  supported crypto integration
+
 -------------------------------------------------------------------
 Fri Apr 13 13:03:44 PDT 2012 - ben.kevan@gmail.com
 

sssd.spec

@@ -17,18 +17,19 @@
 
 
 Name:           sssd
-Version:        1.8.2
+Version:        1.8.3
 Release:        0
 Summary:        System Security Services Daemon
 License:        GPL-3.0+ and LGPL-3.0+
 Group:          System/Daemons
 Url:            https://fedorahosted.org/sssd/
 
-Source0:        %{name}-%{version}.tar.gz
+Source:         https://fedorahosted.org/released/sssd/%name-%version.tar.gz
-Source1:        baselibs.conf
+Source2:        https://fedorahosted.org/released/sssd/%name-%version.tar.gz.asc
+Source3:        baselibs.conf
 Patch3:         0003-Allow-LDAP-to-decide-when-an-expiration-warning-is-w.patch
-Patch4:         0004-avoid-hard-crypto-dep.diff
 Patch5:         0005-implicit-decl.diff
+Patch6:         libdl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %define servicename sssd
@@ -51,9 +52,9 @@ BuildRequires:  pkgconfig(dhash) >= 0.4.2
 BuildRequires:  pkgconfig(ini_config) >= 0.6.1
 BuildRequires:  pkgconfig(ldb) >= 0.9.2
 BuildRequires:  pkgconfig(libcares)
-BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(libnl-1) >= 1.1
 BuildRequires:  pkgconfig(libpcre) >= 7
+BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(popt)
 BuildRequires:  pkgconfig(python)
 BuildRequires:  pkgconfig(talloc)
@@ -67,10 +68,10 @@ BuildRequires:  libdhash-devel >= 0.4.2
 BuildRequires:  libini_config-devel >= 0.6.1
 BuildRequires:  libldb-devel >= 0.9.2
 BuildRequires:  libnl-devel >= 1.1
-BuildRequires:  libopenssl-devel
 BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel >= 1.1.3
 BuildRequires:  libtevent-devel
+BuildRequires:  mozilla-nss-devel
 BuildRequires:  pcre-devel >= 7
 BuildRequires:  popt-devel
 BuildRequires:  python-devel
@@ -171,7 +172,7 @@ Security Services Daemon (sssd).
 
 %prep
 %setup -q
-%patch -P 3 -P 4 -P 5 -p1
+%patch -P 3 -P 5 -P 6 -p1
 
 %build
 autoreconf