From 332ea26ea06f212d2fc483e802e26803d4da41bf Mon Sep 17 00:00:00 2001
From: Tim 'timtim' Ellis <tim.ellis@foonas.org>
Date: Sun, 25 Jan 2009 22:46:12 +0000
Subject: [PATCH] samba: 3.2.5 -> 3.2.7

---
 .../samba/{samba-3.2.5 => samba-3.2.7}/config-h.patch |  0
 .../{samba-3.2.5 => samba-3.2.7}/configure.patch      |  0
 packages/samba/samba-3.2.7/mtab.patch                 | 11 +++++++++++
 packages/samba/{samba-3.2.5 => samba-3.2.7}/smb.conf  |  0
 packages/samba/samba.inc                              |  2 --
 packages/samba/{samba_3.2.5.bb => samba_3.2.7.bb}     |  9 ++++++++-
 6 files changed, 19 insertions(+), 3 deletions(-)
 rename packages/samba/{samba-3.2.5 => samba-3.2.7}/config-h.patch (100%)
 rename packages/samba/{samba-3.2.5 => samba-3.2.7}/configure.patch (100%)
 create mode 100644 packages/samba/samba-3.2.7/mtab.patch
 rename packages/samba/{samba-3.2.5 => samba-3.2.7}/smb.conf (100%)
 rename packages/samba/{samba_3.2.5.bb => samba_3.2.7.bb} (90%)

diff --git a/packages/samba/samba-3.2.5/config-h.patch b/packages/samba/samba-3.2.7/config-h.patch
similarity index 100%
rename from packages/samba/samba-3.2.5/config-h.patch
rename to packages/samba/samba-3.2.7/config-h.patch
diff --git a/packages/samba/samba-3.2.5/configure.patch b/packages/samba/samba-3.2.7/configure.patch
similarity index 100%
rename from packages/samba/samba-3.2.5/configure.patch
rename to packages/samba/samba-3.2.7/configure.patch
diff --git a/packages/samba/samba-3.2.7/mtab.patch b/packages/samba/samba-3.2.7/mtab.patch
new file mode 100644
index 0000000000..2ee8ba0941
--- /dev/null
+++ b/packages/samba/samba-3.2.7/mtab.patch
@@ -0,0 +1,11 @@
+diff -urN source/client/mtab.c samba-3.2.7//source/client/mtab.c
+--- source/client/mtab.c	2008-12-19 13:57:33.000000000 +0000
++++ source/client/mtab.c	2009-01-09 23:14:00.717671075 +0000
+@@ -32,6 +32,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <sys/stat.h>
+ #include <time.h>
+ #include <fcntl.h>
+ #include <mntent.h>
diff --git a/packages/samba/samba-3.2.5/smb.conf b/packages/samba/samba-3.2.7/smb.conf
similarity index 100%
rename from packages/samba/samba-3.2.5/smb.conf
rename to packages/samba/samba-3.2.7/smb.conf
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index c11be98b39..b962a63a3c 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -36,7 +36,6 @@ do_compile () {
 }
 
 do_install_append() {
-	mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true
 	ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so
 	mkdir -p ${D}${base_sbindir}
 	rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs
@@ -44,7 +43,6 @@ do_install_append() {
 	ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs
 	rm -f ${D}${bindir}/*.old
 	rm -f ${D}${sbindir}/*.old
-	install -c -m 755 mount.cifs  ${D}${base_sbindir}/mount.cifs
 	[ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/
 	[ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/
 }
diff --git a/packages/samba/samba_3.2.5.bb b/packages/samba/samba_3.2.7.bb
similarity index 90%
rename from packages/samba/samba_3.2.5.bb
rename to packages/samba/samba_3.2.7.bb
index d1d5b7b4ce..4c4c43bcd2 100644
--- a/packages/samba/samba_3.2.5.bb
+++ b/packages/samba/samba_3.2.7.bb
@@ -1,11 +1,12 @@
 require samba.inc
 inherit update-rc.d
 
-PR = "r8"
+PR = "r0"
 
 SRC_URI += "file://config-lfs.patch;patch=1 \
             file://quota.patch;patch=1;pnum=0 \
             file://config-h.patch;patch=1 \
+            file://mtab.patch;patch=1 \
 	    file://init \
 	    file://smb.conf \
 	        "
@@ -46,6 +47,12 @@ do_configure() {
 	oe_runconf
 }
 
+# Override samba.inc because building mount.cifs separately not necessary anymore and causes issues
+do_compile () {
+        oe_runmake proto_exists
+        base_do_compile
+}
+
 do_install_append() {
 	install -d "${D}/var/log/samba"
 	install -d "${D}${sysconfdir}/init.d"
-- 
2.39.5