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

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index e14f0fcceba8bb64f50197cb01469dca8b1cc2cc..4e057953e9e699f77c1c421ede3a5aef3d97ee70 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -28,6 +28,7 @@ usr/share/clamav
 #usr/share/man/man1/clamscan.1
 #usr/share/man/man1/freshclam.1
 #usr/share/man/man1/sigtool.1
+#usr/share/man/man5/clamav-milter.conf.5
 #usr/share/man/man5/clamd.conf.5
 #usr/share/man/man5/freshclam.conf.5
 #usr/share/man/man8/clamav-milter.8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 7c26196414738e113f2cd598417470cb3b2fab84..600f66c6ad39237035bacf993c62379762dc466f 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -27,7 +27,6 @@
 * MailTools-1.74
 * Net-DNS-0.47
 * Net-IPv4Addr-0.10
-* Net-SSLeay-1.35
 * Net-SSLeay-1.36
 * Net-Server-0.97
 * Pound-2.5
@@ -66,7 +65,7 @@
 * ccache-3.0pre0
 * cdrtools-2.01.01
 * centerim-4.22.1
-* clamav-0.96
+* clamav-0.96.1
 * cmake-2.4.8
 * collectd-4.9.1
 * compat-wireless-2.6.34-kmod-2.6.32.12-ipfire
@@ -284,7 +283,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6
-* samba-3.5.2
+* samba-3.5.3
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01