Merge branch 'master' into kernel-4.9

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

diff --git a/lfs/samba b/lfs/samba
index 8f0b946eceabf90f87664da7fc64a78486f55378..d54d507af755d65ecd83fdb9bdd9e61c38847620 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 65
+PAK_VER    = 67
 
 DEPS       = "cups krb5"
 
@@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -153,7 +153,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.99-fix_dirsort_ea-support.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2017-7494-v3-6.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/doc-update.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.x-winbind_tevent_poll.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/samba-3.6.x-winbind_tevent_poll.patch
 
 
        cd $(DIR_APP)/source3 && ./autogen.sh
@@ -170,10 +170,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-libsmbclient \
                --with-libsmbsharemodes \
                --with-sendfile-support \
-               --without-smbwrapper \
-               --with-mmap \
                --with-fhs \
-               --with-vfs \
                --with-winbind \
                --disable-swat \
                --enable-cups \
@@ -187,8 +184,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        #cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_winbind.so /lib
        #cd $(DIR_APP)/source3 && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
        #cd $(DIR_APP)/source3 && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
+       -mkdir -p /var/ipfire/samba
        cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
-       -mkdir -p /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