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

diff --git a/lfs/postfix b/lfs/postfix
index 77c6dd0e4aefbccb08c5bd9a6a45492a7e79e005..fd332537a78cae1262f1a2bb7479b383d3c3182d 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = "amavisd mysql"
 

diff --git a/lfs/vsftpd b/lfs/vsftpd
index f3e74a00e1ac37e0e8b1f0656e107dd7d106b71a..7284be96150a4987b7a812b3b30a08fd42c7d9f9 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = ""