Merge remote-tracking branch 'origin/master' into next

Conflicts:
	config/rootfiles/packages/clamav
	lfs/clamav
This commit is contained in:
Michael Tremer
2015-03-04 23:58:47 +01:00
4 changed files with 19 additions and 12 deletions

View File

@@ -11,15 +11,15 @@ usr/bin/sigtool
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
usr/lib/libclamav.so.6.1.22
usr/lib/libclamav.so.6.1.25
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
usr/lib/libclamunrar.so.6.1.22
usr/lib/libclamunrar.so.6.1.25
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
usr/lib/libclamunrar_iface.so.6.1.22
usr/lib/libclamunrar_iface.so.6.1.25
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav
@@ -41,6 +41,5 @@ var/ipfire/clamav/clamd.conf
var/ipfire/clamav/clamd.conf.sample
var/ipfire/clamav/freshclam.conf
var/ipfire/clamav/freshclam.conf.sample
#var/run/clamav
etc/rc.d/init.d/clamav
usr/local/bin/clamavctrl