Merge branch 'temp-stevee-idsv4' into next

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

diff --git a/lfs/samba b/lfs/samba
index dcc3ee051d9ad460a6edc77c830a5817598370d3..97fe9691820f4693c7a8462cc38e0b3b639ae1f7 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,8 @@
 
 include Config
 
-VER        = 4.13.0
+VER        = 4.16.0
+SUMMARY    = A SMB/CIFS File, Print, and Authentication Server
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 69
+PAK_VER    = 84
 
-DEPS       = cups libtirpc krb5 perl-Parse-Yapp
+DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp perl-JSON
+
+SERVICES   = samba
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a7f5cccac09d638b3bd11204003b7e7b
+$(DL_FILE)_BLAKE2 = 6ea27634690d00779ec7f671e48b17246285c9576221d9b9b3f9238cd72310e8aaaeb646031212e65c239d2e959deef7bd9739932db0c716b7ea79cc11f2f7b8
 
 install : $(TARGET)
 
@@ -52,13 +55,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 dist:
        @$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -67,8 +70,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -90,9 +93,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,23 +104,24 @@ $(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)
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)