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

@@ -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 \
+            --sysconfdir=/etc \
-            --with-privatedir=/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 \
+make bin/libsmbclient.so \
-     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

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

packages/network/samba/init.d/23_samba

@@ -5,8 +5,5 @@
 (
     progress  "Starting Samba server"
 
-      mkdir -p /var/run/samba
+    /usr/bin/smbd -D > /dev/null 2>&1
-        touch /var/run/samba/secrets.tdb
-      /usr/bin/smbd > /dev/null 2>&1
-
 )&

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
+  mkdir -p $INSTALL/etc/samba
-    cp $PKG_DIR/config/smb.conf $INSTALL/etc/
+    cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba
-    ln -sf /var/run/samba/secrets.tdb $INSTALL/etc/secrets.tdb
 fi