From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 13 Nov 2020 18:20:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into next
X-Git-Tag: v2.25-core155~384^2~51
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a832b5c2e6f96bef108457d36945ea5d5fa961b3

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

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

a832b5c2e6f96bef108457d36945ea5d5fa961b3
diff --cc config/rootfiles/core/153/filelists/libloc
index 0000000000,ff4a92429c..ff4a92429c
mode 000000,120000..120000
--- a/config/rootfiles/core/153/filelists/libloc
+++ b/config/rootfiles/core/153/filelists/libloc
diff --cc lfs/samba
index 29dfec2e92,29dfec2e92..f57a04737e
--- a/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