Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --cc config/rootfiles/core/153/exclude
Simple merge

diff --cc config/rootfiles/core/153/filelists/libloc
index 0000000000000000000000000000000000000000,ff4a92429cb2937f76a27003ed1fe1ee80479bbc..ff4a92429cb2937f76a27003ed1fe1ee80479bbc
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/152/filelists/libloc
+++ b/config/rootfiles/core/153/filelists/libloc

diff --cc config/rootfiles/oldcore/152/filelists/files
Simple merge

diff --cc lfs/samba
index 29dfec2e92e985f814d7fea82b1d3079216ab017,29dfec2e92e985f814d7fea82b1d3079216ab017..f57a04737ef59c77a0cb72d15266ba8469f26e78
--- 1/lfs/samba
--- 2/lfs/samba
+++ b/lfs/samba
@@@ -32,7 -32,7 +32,7 @@@ DL_FROM    = $(URL_IPFIRE
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = samba
--PAK_VER    = 74
++PAK_VER    = 75
  
  DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp