Fix libreplace.so => not found for libcmdline-credentials.so.

resolves: #907915
This commit is contained in:
Andreas Schneider 2013-02-14 13:43:07 +01:00
parent 4717df1a0e
commit d41675ecaf
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 95ce588e21398d04a1f50fb7cc226236b0b725b5 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 14 Feb 2013 12:14:33 +0100
Subject: [PATCH] waf: Fix correct linking of libreplace with
cmdline-credentials.
cmdline-credentials needs rep_getpass from libreplace. The function has
been replaced in master so this issue only exists in 4.0 releases.
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
---
source4/lib/cmdline/wscript_build | 1 +
1 file changed, 1 insertion(+)
diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build
index 9b6f6e5..eec92d4 100644
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -4,6 +4,7 @@ bld.SAMBA_LIBRARY('cmdline-credentials',
source='credentials.c',
autoproto='credentials.h',
public_deps='samba-credentials popt',
+ deps='replace',
private_library=True)
bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
--
1.8.1.2

View File

@ -1,7 +1,7 @@
# Set --with testsuite or %bcond_without to run the Samba torture testsuite.
%bcond_with testsuite
%define main_release 1
%define main_release 2
%define samba_version 4.0.3
%define talloc_version 2.0.7
@ -78,6 +78,7 @@ Source201: README.downgrade
Patch0: samba-4.0.3-fix_pidl_with_gcc48.patch
Patch1: samba-4.0.3-fix_pdb_ldapsam.patch
Patch2: samba-4.0.3-fix_libcmdline-credentials_linking.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@ -435,6 +436,7 @@ the local kerberos library to use the same KDC as samba and winbind use
%patch0 -p1 -b .pidl_gcc48
%patch1 -p1 -b .pdb_ldapsam
%patch2 -p1 -b .libreplace_linking
%build
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
@ -1344,6 +1346,9 @@ rm -rf %{buildroot}
%{_mandir}/man7/winbind_krb5_locator.7*
%changelog
* Thu Feb 14 2013 - Andreas Schneider <asn@redhat.com> - 2:4.0.3-2
- resolves: #907915 - libreplace.so => not found
* Thu Feb 07 2013 - Andreas Schneider <asn@redhat.com> - 2:4.0.3-1
- Update to Samba 4.0.3.
- resolves: #907544 - Add unowned directory /usr/lib64/samba.