Jan Engelhardt 2013-11-01 22:16:40 +00:00 committed by Git OBS Bridge
parent efbbac7dc0
commit af0fdc6776
8 changed files with 75 additions and 117 deletions

View File

@ -1,28 +0,0 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-03-11 23:31:50.889566758 +0100
build: resolve compiler warnings about implicitly-defined functions
crypto_sha512crypt.c: In function 'sha512_crypt_r':
crypto_sha512crypt.c:200:9: warning: implicit declaration of
function 'mempcpy' [-Wimplicit-function-declaration]
crypto_sha512crypt.c:200:14: warning: incompatible implicit
declaration of built-in function 'mempcpy' [enabled by default]
crypto_sha512crypt.c:221:14: warning: incompatible implicit
declaration of built-in function 'mempcpy' [enabled by default]
---
src/util/crypto/libcrypto/crypto_sha512crypt.c | 1 +
1 file changed, 1 insertion(+)
Index: sssd-1.9.2/src/util/crypto/libcrypto/crypto_sha512crypt.c
===================================================================
--- sssd-1.9.2.orig/src/util/crypto/libcrypto/crypto_sha512crypt.c
+++ sssd-1.9.2/src/util/crypto/libcrypto/crypto_sha512crypt.c
@@ -12,6 +12,7 @@
#include "config.h"
+#define _GNU_SOURCE 1 /* mempcpy */
#include <endian.h>
#include <errno.h>
#include <limits.h>

View File

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

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iEYEABECAAYFAlIeYtcACgkQHsardTLnvCV/QACgroDpJRMaPPFXQfdgQ9Yft1NM
mxAAoJKtJNPWTzOpJ5U/+wfh0o9ZsrX9
=9Bb+
-----END PGP SIGNATURE-----

3
sssd-1.11.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40da555ef1d81f0b73aa4e484719f9ca340dc76b7b549761f2ca775ff90b34bc
size 3442072

7
sssd-1.11.2.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
iEYEABECAAYFAlJxiVwACgkQHsardTLnvCU4CwCfU1uc5bwo9fTZXh4i0KLGp709
wL4Anil81EFYHIFhnGsCs0L300OQmbGp
=2QGa
-----END PGP SIGNATURE-----

View File

@ -1,61 +1,44 @@
From c9b13c7e032fde96cf07c7d298bb7fa65fad220b Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: 2012-11-10 01:36:37.022064770 +0100
build: fix link failure because of wrong use of LDFLAGS
ld: src/sss_client/sss_ssh_authorizedkeys-common.o: undefined
reference to symbol 'pthread_mutexattr_setrobust@@GLIBC_2.12'
For the i'th time,
http://stackoverflow.com/questions/4241683/linker-flags-in-wrong-place
The patch fixes the location of library names, and also adds them
to two program which need them.
Date: Fri, 1 Nov 2013 23:01:09 +0100
Subject: [PATCH] build: fix ordering of linker flags
Libraries MUST be specified in LDADD/LIBADD, not LDFLAGS, because
LDFLAGS appear earlier in the command line and library order is
significant.
---
Makefile.am | 69 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 35 insertions(+), 34 deletions(-)
Makefile.am | 66 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 34 insertions(+), 32 deletions(-)
Index: sssd-1.10.0/Makefile.am
Index: sssd-1.11.2/Makefile.am
===================================================================
--- sssd-1.10.0.orig/Makefile.am
+++ sssd-1.10.0/Makefile.am
@@ -588,7 +588,8 @@ libipa_hbac_la_SOURCES = \
--- sssd-1.11.2.orig/Makefile.am
+++ sssd-1.11.2/Makefile.am
@@ -600,9 +600,10 @@ dist_pkgconfig_DATA += src/providers/ipa
libipa_hbac_la_SOURCES = \
src/providers/ipa/hbac_evaluator.c \
src/util/sss_utf8.c
libipa_hbac_la_LDFLAGS = \
-libipa_hbac_la_LDFLAGS = \
- -version-info 0:1:0 \
+ -version-info 0:1:0
+libipa_hbac_la_LIBADD = \
$(UNICODE_LIBS)
+libipa_hbac_la_LDFLAGS = \
+ -version-info 0:1:0
dist_pkgconfig_DATA += src/lib/idmap/sss_idmap.pc
@@ -604,8 +605,8 @@ libsss_nss_idmap_la_SOURCES = \
libsss_idmap_la_SOURCES = \
@@ -617,8 +618,9 @@ libsss_nss_idmap_la_SOURCES = \
src/sss_client/idmap/sss_nss_idmap.c \
src/sss_client/common.c \
src/util/strtonum.c
+libsss_nss_idmap_la_LIBADD = $(CLIENT_LIBS)
+libsss_nss_idmap_la_LIBADD = \
+ $(CLIENT_LIBS)
libsss_nss_idmap_la_LDFLAGS = \
- $(CLIENT_LIBS) \
-version-info 0:1:0
include_HEADERS = \
@@ -717,11 +718,11 @@ sssd_be_LDADD = \
-ldl \
$(SSSD_LIBS) \
$(CARES_LIBS) \
- $(SSSD_INTERNAL_LTLIBS)
+ $(SSSD_INTERNAL_LTLIBS) \
+ $(PAM_LIBS)
sssd_be_LDFLAGS = \
-Wl,--version-script,$(srcdir)/src/providers/sssd_be.exports \
- -export-dynamic \
- $(PAM_LIBS)
+ -export-dynamic
if BUILD_PYTHON_BINDINGS
sss_obfuscate_pythondir = $(sbindir)
@@ -757,10 +758,9 @@ sss_userdel_SOURCES = \
@@ -771,10 +773,9 @@ sss_userdel_SOURCES = \
$(SSSD_LCL_TOOLS_OBJ)
sss_userdel_LDADD = \
$(TOOLS_LIBS) \
@ -68,7 +51,7 @@ Index: sssd-1.10.0/Makefile.am
sss_groupadd_SOURCES = \
src/tools/sss_groupadd.c \
@@ -774,30 +774,27 @@ sss_groupdel_SOURCES = \
@@ -788,30 +789,27 @@ sss_groupdel_SOURCES = \
$(SSSD_LCL_TOOLS_OBJ)
sss_groupdel_LDADD = \
$(TOOLS_LIBS) \
@ -105,7 +88,7 @@ Index: sssd-1.10.0/Makefile.am
sss_groupshow_SOURCES = \
src/tools/sss_groupshow.c \
@@ -811,10 +808,9 @@ sss_cache_SOURCES = \
@@ -825,10 +823,9 @@ sss_cache_SOURCES = \
$(SSSD_LCL_TOOLS_OBJ)
sss_cache_LDADD = \
$(TOOLS_LIBS) \
@ -118,7 +101,7 @@ Index: sssd-1.10.0/Makefile.am
sss_debuglevel_SOURCES = \
src/tools/sss_debuglevel.c \
@@ -837,7 +833,7 @@ sss_sudo_cli_SOURCES = \
@@ -851,7 +848,7 @@ sss_sudo_cli_SOURCES = \
src/sss_client/sudo/sss_sudo_response.c \
src/sss_client/sudo_testcli/sudo_testcli.c
sss_sudo_cli_CFLAGS = $(AM_CFLAGS)
@ -127,7 +110,7 @@ Index: sssd-1.10.0/Makefile.am
endif
if BUILD_SSH
@@ -847,8 +843,8 @@ sss_ssh_authorizedkeys_SOURCES = \
@@ -861,8 +858,8 @@ sss_ssh_authorizedkeys_SOURCES = \
src/sss_client/ssh/sss_ssh_authorizedkeys.c
sss_ssh_authorizedkeys_CFLAGS = $(AM_CFLAGS)
sss_ssh_authorizedkeys_LDADD = \
@ -138,7 +121,7 @@ Index: sssd-1.10.0/Makefile.am
sss_ssh_knownhostsproxy_SOURCES = \
src/sss_client/common.c \
@@ -856,8 +852,8 @@ sss_ssh_knownhostsproxy_SOURCES = \
@@ -870,8 +867,8 @@ sss_ssh_knownhostsproxy_SOURCES = \
src/sss_client/ssh/sss_ssh_knownhostsproxy.c
sss_ssh_knownhostsproxy_CFLAGS = $(AM_CFLAGS)
sss_ssh_knownhostsproxy_LDADD = \
@ -149,7 +132,7 @@ Index: sssd-1.10.0/Makefile.am
endif
#################
@@ -1309,7 +1305,7 @@ noinst_PROGRAMS += autofs_test_client
@@ -1402,7 +1399,7 @@ noinst_PROGRAMS += autofs_test_client
endif
pam_test_client_SOURCES = src/sss_client/pam_test_client.c
@ -158,7 +141,7 @@ Index: sssd-1.10.0/Makefile.am
if BUILD_AUTOFS
autofs_test_client_SOURCES = \
@@ -1317,7 +1313,7 @@ autofs_test_client_SOURCES = \
@@ -1410,7 +1407,7 @@ autofs_test_client_SOURCES = \
src/sss_client/autofs/sss_autofs.c \
src/sss_client/common.c
autofs_test_client_CFLAGS = $(AM_CFLAGS)
@ -167,35 +150,31 @@ Index: sssd-1.10.0/Makefile.am
endif
####################
@@ -1340,10 +1336,11 @@ libnss_sss_la_SOURCES = \
@@ -1432,8 +1429,9 @@ libnss_sss_la_SOURCES = \
src/sss_client/nss_mc_passwd.c \
src/sss_client/nss_mc_group.c \
src/sss_client/nss_mc.h
+libnss_sss_la_LIBADD = \
+ $(CLIENT_LIBS)
libnss_sss_la_LDFLAGS = \
- $(CLIENT_LIBS) \
-module \
-version-info 2:0:0 \
-Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports
+libnss_sss_la_LIBADD = \
+ $(CLIENT_LIBS)
pamlib_LTLIBRARIES = pam_sss.la
pam_sss_la_SOURCES = \
@@ -1354,11 +1351,12 @@ pam_sss_la_SOURCES = \
@@ -1446,9 +1444,10 @@ pam_sss_la_SOURCES = \
src/util/atomic_io.c \
src/sss_client/sss_pam_macros.h
pam_sss_la_LDFLAGS = \
- $(CLIENT_LIBS) \
-pam_sss_la_LDFLAGS = \
+pam_sss_la_LIBADD = \
$(CLIENT_LIBS) \
- -lpam \
+ -lpam
+pam_sss_la_LDFLAGS = \
-module \
-avoid-version \
-Wl,--version-script,$(srcdir)/src/sss_client/sss_pam.exports
+pam_sss_la_LIBADD = \
+ $(CLIENT_LIBS) \
+ -lpam
if BUILD_SUDO
@@ -1369,8 +1367,9 @@ libsss_sudo_la_SOURCES = \
@@ -1462,8 +1461,9 @@ libsss_sudo_la_SOURCES = \
src/sss_client/sudo/sss_sudo.c \
src/sss_client/sudo/sss_sudo.h \
src/sss_client/sudo/sss_sudo_private.h
@ -206,30 +185,27 @@ Index: sssd-1.10.0/Makefile.am
-Wl,--version-script,$(srcdir)/src/sss_client/sss_sudo.exports \
-module \
-avoid-version
@@ -1388,10 +1387,11 @@ libsss_autofs_la_SOURCES = \
@@ -1480,8 +1480,9 @@ libsss_autofs_la_SOURCES = \
src/sss_client/autofs/sss_autofs.c \
src/sss_client/autofs/sss_autofs_private.h
+libsss_autofs_la_LIBADD = \
+ $(CLIENT_LIBS)
libsss_autofs_la_LDFLAGS = \
- $(CLIENT_LIBS) \
-module \
-avoid-version \
-Wl,--version-script,$(srcdir)/src/sss_client/autofs/sss_autofs.exports
+libsss_autofs_la_LIBADD = \
+ $(CLIENT_LIBS)
endif
dist_noinst_DATA += \
@@ -1725,10 +1725,11 @@ sssd_pac_plugin_la_CFLAGS = \
@@ -1831,9 +1832,10 @@ sssd_pac_plugin_la_SOURCES = \
sssd_pac_plugin_la_CFLAGS = \
$(AM_CFLAGS) \
$(KRB5_CFLAGS)
sssd_pac_plugin_la_LDFLAGS = \
- $(CLIENT_LIBS) \
-sssd_pac_plugin_la_LDFLAGS = \
+sssd_pac_plugin_la_LIBADD = \
$(CLIENT_LIBS) \
- -lkrb5 \
+ -lkrb5
+sssd_pac_plugin_la_LDFLAGS = \
-avoid-version \
-module
+sssd_pac_plugin_la_LIBADD = \
+ $(CLIENT_LIBS) \
+ -lkrb5
if BUILD_PYTHON_BINDINGS
pysss_la_SOURCES = \

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Nov 1 22:12:03 UTC 2013 - jengelh@inai.de
- Update to new upstream release 1.11.2
* A new option ad_access_filter was added. This option allows the
administrator to easily configure LDAP search filter that the users
logging in must match in order to be granted access.
* The Kerberos provider will no longer try to create public
directories when evaluating the krb5_ccachedir option.
- Remove 0005-implicit-decl.diff (merged upstream)
-------------------------------------------------------------------
Tue Sep 3 21:12:37 UTC 2013 - jengelh@inai.de

View File

@ -17,7 +17,7 @@
Name: sssd
Version: 1.11.0
Version: 1.11.2
Release: 0
Summary: System Security Services Daemon
License: GPL-3.0+ and LGPL-3.0+
@ -28,8 +28,7 @@ Url: https://fedorahosted.org/sssd/
Source: https://fedorahosted.org/released/sssd/sssd-%version.tar.gz
Source2: https://fedorahosted.org/released/sssd/sssd-%version.tar.gz.asc
Source3: baselibs.conf
Patch1: 0005-implicit-decl.diff
Patch2: sssd-ldflags.diff
Patch1: sssd-ldflags.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define servicename sssd
@ -223,7 +222,7 @@ Security Services Daemon (sssd).
%prep
%{?gpg_verify: %gpg_verify %{S:2}}
%setup -q
#%patch -P 1 -P 2 -p1
%patch -P 1 -p1
%build
%if 0%{?suse_version} < 1210