Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/lfs/fetchmail b/lfs/fetchmail
index 4ab1cc00fc2b1fd8ecae3bdc4d8f7f332b829b82..33b9f9caae295355fe3f836503d72974001d7eb5 100644 (file)
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.3.11
+VER        = 6.3.16
 
 THISAPP    = fetchmail-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fetchmail
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,11 +44,12 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 43b28f296cc0024d3c727319eacae324
+$(DL_FILE)_MD5 = 1a40acb371376c7d54fe468c99dfc216
 
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))

diff --git a/lfs/postfix b/lfs/postfix
index 503f243b34e17b75996545c310dcf490d9f6f51c..bbb9b0ca41250d259c3f8f685849e16a3e919b31 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.2
+VER        = 2.6.5
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = "amavisd mysql"
 
@@ -40,14 +40,11 @@ DEPS       = "amavisd mysql"
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-       postfix-2.5.5.patch
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-postfix-2.5.5.patch = $(DL_FROM)/postfix-2.5.5.patch
 
-$(DL_FILE)_MD5 = 1f0edbd521d2b0473626f4d61e8bb4eb
-postfix-2.5.5.patch_MD5 = 36cb54665d95016af4ce0cd5f85c20a8
+$(DL_FILE)_MD5 = 6b954cfb3eb6141dac1e773281211717
 
 install : $(TARGET)
 

diff --git a/lfs/squidclamav b/lfs/squidclamav
index 68d5f6acdd952203d9accee9a40d529e6e7fbd7f..9c37753baab551a31dd45d02b18006f639e5ac9b 100644 (file)
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.2
+VER        = 5.3
 
 THISAPP    = squidclamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "clamav"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7f8d48962f139f747fa9b2050ede19a3
+$(DL_FILE)_MD5 = 39f4b98294782039840b2052eab543e2
 
 install : $(TARGET)