core152: Ship yaml

[ipfire-2.x.git] / lfs / samba

diff --git a/lfs/samba b/lfs/samba
index dcc3ee051d9ad460a6edc77c830a5817598370d3..15f9d10d2096ca461af252ee91cc4284ba6e2284 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 69
+PAK_VER    = 71
 
-DEPS       = cups libtirpc krb5 perl-Parse-Yapp
+DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp
 
 ###############################################################################
 # Top-level Rules
@@ -90,9 +90,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-acl-support \
                --with-sendfile-support \
                --with-winbind \
-               --enable-fhs \
+               --enable-avahi \
                --enable-cups \
-               --disable-avahi \
+               --enable-fhs \
                --with-syslog
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
@@ -101,21 +101,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
        cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
        chown nobody:nobody -R /var/ipfire/samba/
-       cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global
-       cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc
-       cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings
-       cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
-       cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
        cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
        rm -rf /var/lib/samba/private
        ln -s /var/ipfire/samba/private /var/lib/samba/private
-       -mkdir -p /var/log/samba
        install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba
 
        -mkdir -p /var/lib/samba/winbindd_privileged
        chmod 750 /var/lib/samba/winbindd_privileged
        chgrp wbpriv /var/lib/samba/winbindd_privileged
 
+       # Create spool directory for print jobs
+       mkdir -p /var/spool/samba
+       chmod -v 1777 /var/spool/samba/
+
        #install initscripts
        $(call INSTALL_INITSCRIPT,samba)