Merge branch 'master' into next

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index fae43b8c41df449497478e603eff7f5d32aea114..b08aec6d1ee12ac70cf53b942671e8164173cdfe 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,18 +10,19 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.9
+usr/lib/libclamav.so.6.1.10
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.9
+usr/lib/libclamunrar.so.6.1.10
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.9
+usr/lib/libclamunrar_iface.so.6.1.10
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
+#usr/share/man/man1/clambc.1
 #usr/share/man/man1/clamconf.1
 #usr/share/man/man1/clamdscan.1
 #usr/share/man/man1/clamdtop.1

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 866d173c6f782fecb71c6fde6562deee259c014a..f10323249b8c5adec6d7c1b4bf7a4d9401f3ec0f 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-core48.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core49.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/lfs/clamav b/lfs/clamav
index a9d97098d0c963be0e04e34adc35a524c54301b6..6226fe4bfddf7099fc310fd30784290b99723970 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.97
+VER        = 0.97.1
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 15
+PAK_VER    = 16
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b
+$(DL_FILE)_MD5 = 4f3fb74ff1098c25eef8e10721478c29
 
 install : $(TARGET)
 

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 2292c3ee2c828e465cd671563cfb55e8abb29396..e08e51e402df8be3183b26aa674f275b089c4e67 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-core48.iso.torrent
+DL_FILE    = ipfire-2.9.i586-full-core49.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 24
+PAK_VER    = 25
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e
+$(DL_FILE)_MD5 = 0da274af552f5de5b0f65102b17631f1
 
 install : $(TARGET)