[meego-commits] 9134: Changes to Trunk:Testing/samba

[Kangkai Yin]

Hi,
I have made the following changes to samba in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Kangkai Yin

[This message was auto-generated]

---

Request #9134:

  submit:   home:kai:branches:Trunk:Testing/samba(r13)(cleanup) -> Trunk:Testing/samba


Message:
    Add a patch about rpath-link to fix build failure for ARM. Fix BMC #8833

State:   new          2010-11-01T19:28:51 kai
Comment: None



changes files:
--------------
--- samba.changes
+++ samba.changes
@@ -0,0 +1,3 @@
+* Tue Nov  2 2010 Yin Kangkai <kangkai.yin at intel.com> - 3.5.4
+- Add a patch about rpath-link to fix build failure for ARM. Fix BMC #8833
+

new:
----
  samba-3.5.4-rpath-link-fix-arm-build-fail.patch

spec files:
-----------
--- samba.spec
+++ samba.spec
@@ -47,6 +47,7 @@
 Patch202: samba-3.5.4-offline-login-fails-because-winbind-del.patch
 # BMC #6902 Samba CVE-2010-3069: Stack-based buffer overflow
 Patch203: samba-3.5.4-CVE-2010-3069.patch
+Patch204: samba-3.5.4-rpath-link-fix-arm-build-fail.patch
 
 Requires(pre): samba-common = %{samba_version}-%{release}
 Requires: pam >= 0.64
@@ -208,6 +209,7 @@
 %patch201 -p1 -b .winbind-ntlm
 %patch202 -p1 -b .winbind-offline
 %patch203 -p1 -b .cve-2010-3069
+%patch204 -p1
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION

other changes:
--------------

++++++ samba-3.5.4-rpath-link-fix-arm-build-fail.patch (new)
--- samba-3.5.4-rpath-link-fix-arm-build-fail.patch
+++ samba-3.5.4-rpath-link-fix-arm-build-fail.patch
+--- samba-3.5.4/source3/lib/netapi/examples/Makefile.in.orig	2010-11-01 14:22:19.000000000 +0800
++++ samba-3.5.4/source3/lib/netapi/examples/Makefile.in	2010-11-02 09:42:58.000000000 +0800
+@@ -8,7 +8,7 @@
+ CCFLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS)
+ CC=@CC@
+ PICFLAG=@PICFLAG@
+-LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
++LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ -Wl,-rpath-link=../../../bin
+ DYNEXP=@DYNEXP@
+ NETAPI_LIBS=$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
+ CMDLINE_LIBS=$(NETAPI_LIBS) @POPTLIBS@