Merge branch 'core157'

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

diff --git a/lfs/samba b/lfs/samba
index 874166d2e306e2413b765e417caa17dffb124815..4c6ebddf67c62b0894d6bfed18bdd79a009db813 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.13.0
+VER        = 4.14.4
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 70
+PAK_VER    = 80
 
 DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a7f5cccac09d638b3bd11204003b7e7b
+$(DL_FILE)_MD5 = 171629ad42b4b303107e8b0fff942a1f
 
 install : $(TARGET)
 
@@ -101,21 +101,22 @@ $(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 password change helper script
+       install -m 755 $(DIR_SRC)/config/samba/samba-change-password /usr/sbin/samba-change-password
+
        #install initscripts
        $(call INSTALL_INITSCRIPT,samba)