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

This commit is contained in:
Michael Tremer
2014-05-17 15:18:43 +02:00
2 changed files with 9 additions and 6 deletions

View File

@@ -4,21 +4,22 @@ usr/bin/clamconf
usr/bin/clamdscan
usr/bin/clamdtop
usr/bin/clamscan
usr/bin/clamsubmit
usr/bin/freshclam
usr/bin/sigtool
#usr/include/clamav.h
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
usr/lib/libclamav.so.6.1.20
usr/lib/libclamav.so.6.1.22
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
usr/lib/libclamunrar.so.6.1.20
usr/lib/libclamunrar.so.6.1.22
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
usr/lib/libclamunrar_iface.so.6.1.20
usr/lib/libclamunrar_iface.so.6.1.22
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav
@@ -27,6 +28,7 @@ usr/share/clamav
#usr/share/man/man1/clamdscan.1
#usr/share/man/man1/clamdtop.1
#usr/share/man/man1/clamscan.1
#usr/share/man/man1/clamsubmit.1
#usr/share/man/man1/freshclam.1
#usr/share/man/man1/sigtool.1
#usr/share/man/man5/clamav-milter.conf.5

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.98.1
VER = 0.98.3
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 = 24
PAK_VER = 25
DEPS = ""
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b1ec7b19dea8385954515ef1d63576d8
$(DL_FILE)_MD5 = b649d35ee85d4d6075a98173dd255c17
install : $(TARGET)
@@ -96,6 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Disable PaX mprotect for clamd and freshclam
paxctl -cm /usr/sbin/clamd
paxctl -cm /usr/bin/clamscan
paxctl -cm /usr/bin/freshclam
@rm -rf $(DIR_APP)