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

diff --git a/config/rootfiles/common/libtorrent b/config/rootfiles/common/libtorrent
index fcfe7f4beaa95768de8b77ba9eb63acfff01ece0..7e249a14be4ac77bb94067e9df04dcdd99347502 100644 (file)
--- a/config/rootfiles/common/libtorrent
+++ b/config/rootfiles/common/libtorrent
@@ -41,7 +41,7 @@
 #usr/lib/libtorrent.la
 #usr/lib/libtorrent.so
 #usr/lib/libtorrent.so.11
-#usr/lib/libtorrent.so.11.0.4
+#usr/lib/libtorrent.so.11.0.6
 #usr/lib/pkgconfig/libtorrent.pc
 #usr/include/torrent/dht_manager.h
 #usr/include/torrent/peer/connection_list.h

diff --git a/config/rootfiles/packages/rtorrent b/config/rootfiles/packages/rtorrent
index 81d53f2731b8b08d125d275a1d4d9faa9ebc1775..93709f49f732f5cfe15026098403aae01477e491 100644 (file)
--- a/config/rootfiles/packages/rtorrent
+++ b/config/rootfiles/packages/rtorrent
@@ -44,7 +44,7 @@ usr/bin/rtorrent
 #usr/lib/libtorrent.la
 usr/lib/libtorrent.so
 usr/lib/libtorrent.so.11
-usr/lib/libtorrent.so.11.0.4
+usr/lib/libtorrent.so.11.0.6
 #usr/lib/pkgconfig/libtorrent.pc
 #usr/include/sigc++-2.0
 #usr/include/sigc++-2.0/sigc++

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 83d3d02cd2d61ec8a069054186ff7fac3fe620d4..f2c6bc5d387f1b0314051889cecb0cd416e89e9b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -188,7 +188,7 @@
 * libshout-2.2.2
 * libsigc++-2.0.17
 * libtool-1.5.22
-* libtorrent-0.12.4
+* libtorrent-0.12.6
 * libupnp-1.6.6
 * libusb-0.1.12
 * libvorbis-1.2.3
@@ -293,7 +293,7 @@
 * rrdtool-1.2.15
 * rssdler-0.4.0a
 * rsync-3.0.6
-* rtorrent-0.8.4
+* rtorrent-0.8.6
 * samba-3.3.9
 * sane-1.0.19
 * screen-4.0.3
@@ -312,7 +312,7 @@
 * squashfs3.4
 * squid-2.7.STABLE7
 * squidGuard-1.4
-* squidclamav-4.0
+* squidclamav-4.1
 * sshfs-fuse-2.2
 * sslh-1.6i
 * streamripper-1.63.5

diff --git a/lfs/libtorrent b/lfs/libtorrent
index d466ee95ecc01dbc6d0c2d095fce5ddc9497b702..7ce3b23963a4709ac00545c1ff9dd5ca12704166 100644 (file)
--- a/lfs/libtorrent
+++ b/lfs/libtorrent
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.12.4
+VER        = 0.12.6
 
 THISAPP    = libtorrent-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7e4b4c29a69c86c38e3e60ec11fc2255
+$(DL_FILE)_MD5 = 037499ed708aaf72988cee60e5a8d96b
 
 install : $(TARGET)
 

diff --git a/lfs/rtorrent b/lfs/rtorrent
index de07c6dd1d72dd67989d023152f397a3a8bfd61e..3ccbb4c2f1944f5aec0dd67e5d76fef087a61e19 100644 (file)
--- a/lfs/rtorrent
+++ b/lfs/rtorrent
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.8.4
+VER        = 0.8.6
 
 THISAPP    = rtorrent-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rtorrent
-PAK_VER    = 4
+PAK_VER    = 5
 CFLAGS     =
 CXXFLAGS   =
 
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dc0f37d933b0b6c713ad617e09441f3b
+$(DL_FILE)_MD5 = b804c45c01c40312926bcea6b55bb084
 
 install : $(TARGET)
 

diff --git a/lfs/squidclamav b/lfs/squidclamav
index a2887567cd7c64d1e9a678db738da57628c92317..80e99f85bdbbe5643e5307b85a9e20f0b0e7445c 100644 (file)
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.0
+VER        = 4.1
 
 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    = 7
+PAK_VER    = 8
 
 DEPS       = "clamav"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0a5e2fa8a4270a90235621fce9269949
+$(DL_FILE)_MD5 = 5e79064fce4dacc1af34ba21fd4f0880
 
 install : $(TARGET)