samba: add metafile support, update to samba-3.5.4, build and install nmbd support, add some usefull options

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/network/samba/build

@@ -2,10 +2,7 @@
 
 . config/options $1
 
-$SCRIPTS/build toolchain
-
 if [ "$AVAHI_DAEMON" = yes ]; then
-  $SCRIPTS/build avahi
   SMB_AVAHI="--enable-avahi"
 else
   SMB_AVAHI="--disable-avahi"
@@ -14,6 +11,8 @@ fi
 export samba_cv_CC_NEGATIVE_ENUM_VALUES=no
 
 cd $PKG_BUILD/source3
+
+sh autogen.sh
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -23,14 +22,17 @@ cd $PKG_BUILD/source3
             --with-privatedir=/var/run \
             --enable-shared \
             --disable-static \
+            --enable-shared-libs \
             --enable-debug \
+            --disable-swat \
+            --disable-cups \
+            --disable-iprint \
             --with-fhs \
             --enable-pie \
             --with-pthreads \
             --with-sqlite3 \
             --enable-relro \
-            --disable-swat \
+            --disable-dnssd \
-            --disable-cups \
             $SMB_AVAHI \
             --without-pam \
             --without-ads \
@@ -41,15 +43,17 @@ cd $PKG_BUILD/source3
             --with-cifsumount \
             --without-ldap \
             --without-acl-support \
-            --without-winbind \
+            --with-winbind \
-            --with-dnsupdate \
+            --without-dnsupdate \
-            --with-automount \
+            --without-automount \
             --with-included-popt \
             --with-libsmbclient \
-            --without-libsmbsharemodes \
+            --with-libsmbsharemodes \
             --without-quotas \
             --without-sys-quotas \
             --with-syslog \
+            --with-utmp \
+            --with-sendfile-support \
 
 make bin/libsmbclient.so
 make bin/mount.cifs
@@ -58,6 +62,7 @@ make bin/smbtree
 
 if [ "$SAMBA_SERVER" = yes ]; then
   make bin/smbd
+  make bin/nmbd
 fi
 
 mkdir -p $SYSROOT_PREFIX/usr/lib

packages/network/samba/install

@@ -2,8 +2,6 @@
 
 . config/options $1
 
-[ "$AVAHI_DAEMON" = yes ] && $SCRIPTS/install avahi
-
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/source3/bin/smbtree $INSTALL/usr/bin
   cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
@@ -11,10 +9,12 @@ mkdir -p $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/source3/bin/libsmbclient.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/source3/bin/libwbclient.so* $INSTALL/usr/lib
 
 if [ "$SAMBA_SERVER" = yes ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin
+    cp $PKG_BUILD/source3/bin/nmbd $INSTALL/usr/bin
 
   mkdir -p $INSTALL/etc/samba
     cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba

packages/network/samba/meta

@@ -0,0 +1,19 @@
+PKG_NAME="samba"
+PKG_VERSION="3.5.4"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.samba.org"
+PKG_URL="http://samba.org/samba/ftp/stable/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="sqlite"
+PKG_BUILD_DEPENDS="toolchain sqlite"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client"
+PKG_LONGDESC="Samba is a SMB server that runs on Unix and other operating systems. It allows these operating systems (currently Unix, Netware, OS/2 and AmigaDOS) to act as a file and print server for SMB and CIFS clients. There are many Lan-Manager compatible clients such as LanManager for DOS, Windows for Workgroups, Windows NT, Windows 95, Linux smbfs, OS/2, Pathworks and more."
+PKG_IS_ADDON="no"
+
+if [ "$AVAHI_DAEMON" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS avahi"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi"
+fi

packages/network/samba/scripts/42_samba

@@ -42,5 +42,6 @@
   mkdir -p /var/log/samba
 
   smbd $SMB_ARG > /dev/null 2>&1
+  nmbd $SMB_ARG > /dev/null 2>&1
 
 )&

packages/network/samba/url

@@ -1 +0,0 @@
-http://samba.org/samba/ftp/stable/samba-3.5.3.tar.gz