Merge branch 'master' into python

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 8b4f00f7f21bf05876eb0b15d906f8e470ed1a79..4e21567effbf8545b5f42e3fac41cde8c9cb7384 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.9.i586-full-core46.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core47.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index d333fc3c015fb9a9dbbd14f2a2c2dad164e17d63..4bdbc481f04716ad91f62f2b6b891f18740fbdc4 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.9.i586-full-core46.iso.torrent
+DL_FILE    = ipfire-2.9.i586-full-core47.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 22
+PAK_VER    = 23
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8484574559180f14f9c98d7d3140c3ed
+$(DL_FILE)_MD5 = 388d32a2f741df4afa76578948804ae3
 
 install : $(TARGET)
 

diff --git a/lfs/samba b/lfs/samba
index 369bb18d5e9d6777d38291fe083f4d4d24e18fc7..449cb12fd2e5fd72bf3b6adde1d54b8a071db160 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.7
+VER        = 3.5.8
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 33
+PAK_VER    = 34
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b04441da711df05a1525bf57b92c051b
+$(DL_FILE)_MD5 = 355b4530c20997e94aebc74cd6ea5307
 
 install : $(TARGET)
 

diff --git a/lfs/squidclamav b/lfs/squidclamav
index 662594af04a2b06791cda147bede87841c31813e..8fcc3c234aed055249936262fc02de943e69030f 100644 (file)
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.4
+VER        = 5.7
 
 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    = 13
+PAK_VER    = 14
 
 DEPS       = "clamav"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e2adab89b1d46ace78b4ec5200dd1285
+$(DL_FILE)_MD5 = 02207a95e2968998574e30d35e0d1f0e
 
 install : $(TARGET)