From 0881409386405ad2c35995e0eb5c14767d439846 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Sat, 20 Feb 2010 12:12:42 +0100
Subject: [PATCH] samba: - various cleanups - set privatedir to /var/run - set
 configdir to /etc/samba - copy smb.conf to /etc/samba - add some needed
 options - dont build smbtree - change smb.conf a bit

---
 packages/network/samba/build           | 22 +++++++++++-----------
 packages/network/samba/config/smb.conf |  6 +++---
 packages/network/samba/init.d/23_samba |  5 +----
 packages/network/samba/install         |  5 ++---
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/packages/network/samba/build b/packages/network/samba/build
index 6c0581f293..fc6f572717 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -5,12 +5,6 @@
 $SCRIPTS/build toolchain
 $SCRIPTS/build libiconv
 
-#export samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
-#export samba_cv_USE_SETEUID=yes
-#export samba_cv_HAVE_IFACE_IFCONF=yes
-#export SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no
-#export samba_cv_have_longlong=yes
-
 export samba_cv_CC_NEGATIVE_ENUM_VALUES=no
 
 cd $PKG_BUILD/source3
@@ -18,10 +12,18 @@ cd $PKG_BUILD/source3
             --build=$HOST_NAME \
             --prefix=/usr \
             --localstatedir=/var \
-            --with-configdir=/etc \
-            --with-privatedir=/etc \
+            --sysconfdir=/etc \
+            --with-configdir=/etc/samba \
+            --with-privatedir=/var/run \
+            --enable-shared \
+            --disable-static \
             --disable-pie \
             --disable-cups \
+            --enable-avahi \
+            --without-ads \
+            --with-libtalloc \
+            --with-libtdb \
+            --without-libnetapi \
             --without-cifsmount \
             --without-ldap \
             --without-winbind \
@@ -33,8 +35,7 @@ cd $PKG_BUILD/source3
             --with-syslog \
             --with-libiconv=$SYSROOT_PREFIX/usr \
 
-make bin/smbtree \
-     bin/libsmbclient.so \
+make bin/libsmbclient.so \
      bin/smbd
 
 mkdir -p $SYSROOT_PREFIX/usr/lib
@@ -44,7 +45,6 @@ mkdir -p $SYSROOT_PREFIX/usr/lib
 
 mkdir -p $SYSROOT_PREFIX/usr/include
   cp include/libsmbclient.h $SYSROOT_PREFIX/usr/include
-#cp include/libmsrpc.h $SYSROOT_PREFIX/usr/include
 
 mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
   cp pkgconfig/smbclient.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf
index 4b7f6004e5..656e7ba5a5 100644
--- a/packages/network/samba/config/smb.conf
+++ b/packages/network/samba/config/smb.conf
@@ -1,12 +1,12 @@
 [global]
-  server string = OpenELEC(%i)
+  server string = OpenELEC.tv Mediacenter(%i)
   security = share
   guest account = root
   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
   wins support = no
   syslog only = yes
 
-[root]
+[Storage]
   path = /storage
   available = yes
   browsable = yes
@@ -21,6 +21,6 @@
 ;  available = yes
 ;  browsable = yes
 ;  public = yes
-;  writable = yes 
+;  writable = yes
 ;  root preexec = /usr/bin/rw /mnt/mydisk
 ;  root postexec = /usr/bin/ro /mnt/mydisk
diff --git a/packages/network/samba/init.d/23_samba b/packages/network/samba/init.d/23_samba
index ccaf7274d6..dbe65123e8 100755
--- a/packages/network/samba/init.d/23_samba
+++ b/packages/network/samba/init.d/23_samba
@@ -5,8 +5,5 @@
 (
     progress  "Starting Samba server"
 
-      mkdir -p /var/run/samba
-        touch /var/run/samba/secrets.tdb
-      /usr/bin/smbd > /dev/null 2>&1
-
+    /usr/bin/smbd -D > /dev/null 2>&1
 )&
diff --git a/packages/network/samba/install b/packages/network/samba/install
index 7e5c716a1c..d007bc0d43 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -15,7 +15,6 @@ if [ "$SAMBA_SERVER" = yes ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin
 
-  mkdir -p $INSTALL/etc
-    cp $PKG_DIR/config/smb.conf $INSTALL/etc/
-    ln -sf /var/run/samba/secrets.tdb $INSTALL/etc/secrets.tdb
+  mkdir -p $INSTALL/etc/samba
+    cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba
 fi