Merge branch 'master' into next

diff --git a/lfs/guardian b/lfs/guardian
index 2120a08a4490ac6b65f90e789de82bea2143ad6c..f3001c82128f3ba08290eea295b87cf342f65590 100644 (file)
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = guardian
-PAK_VER    = 13
+PAK_VER    = 14
 
 DEPS       = "perl-inotify2 perl-Net-IP"
 

diff --git a/lfs/gzip b/lfs/gzip
index 537662c33a5f6616f0ef0ca8dcd6fe1b5c8072bf..e61d78a8c6b33db20908320c6d635003e0d7aeca 100644 (file)
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -83,8 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
-       ln -sfv gzip /bin/gunzip
-       ln -sfv gzip /bin/zcat
        mv -v /bin/{gzexe,zcmp,zdiff,zegrep} /usr/bin
        mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin
 endif

diff --git a/lfs/samba b/lfs/samba
index 815a8ece1fdd3c38797c3b9d2c7573d3bb9cc974..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    = 66
+PAK_VER    = 67
 
 DEPS       = "cups krb5"
 
@@ -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