clamav: remove versions <0.95

See removal.txt and

c1aab90e5e removal.txt: proposal to remove ClamAV versions < 0.95 in April

for reasoning.

Signed-off-by: Roman I Khimov <khimov@altell.ru>

7 files changed, 3 insertions, 48 deletions

diff --git a/recipes/clamav/clamav.inc b/recipes/clamav/clamav.inc
index b6aa2a29e3..91aca57497 100644
--- a/recipes/clamav/clamav.inc
+++ b/recipes/clamav/clamav.inc
@@ -36,7 +36,9 @@ inherit autotools update-rc.d binconfig
 EXTRA_OECONF = "--disable-clamav \
                 --with-zlib=${STAGING_DIR_HOST}${layout_prefix} \
                 --with-libcurl \
-                --with-dbdir=${localstatedir}/lib/clamav"
+                --with-dbdir=${localstatedir}/lib/clamav \
+		--program-transform-name='' \
+		"
 
 do_install_append() {
         install -m 0755 -d ${D}${sysconfdir}/default/volatiles \
diff --git a/recipes/clamav/clamav_0.90.2.bb b/recipes/clamav/clamav_0.90.2.bb
deleted file mode 100644
index 588cdcf532..0000000000
--- a/recipes/clamav/clamav_0.90.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require clamav.inc
-
-SRC_URI += "file://cross-compile-fix.patch;patch=1"
-
-PR = "${INC_PR}.0"
-SRC_URI[clamav-0.90.2.md5sum] = "39d1f07a399b551b55096b6ec7325c33"
-SRC_URI[clamav-0.90.2.sha256sum] = "30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa"
diff --git a/recipes/clamav/clamav_0.90.3.bb b/recipes/clamav/clamav_0.90.3.bb
deleted file mode 100644
index 118feb1135..0000000000
--- a/recipes/clamav/clamav_0.90.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require clamav.inc
-
-SRC_URI += "file://cross-compile-fix.patch;patch=1"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[clamav-0.90.3.md5sum] = "d42ccf7a32daeb7c7cc3c8c23a7793ea"
-SRC_URI[clamav-0.90.3.sha256sum] = "939913d15ad0dc583ba609274ae61a948f4fa18b848bd503d958feacdaab54a4"
diff --git a/recipes/clamav/clamav_0.91.1.bb b/recipes/clamav/clamav_0.91.1.bb
deleted file mode 100644
index b71793075a..0000000000
--- a/recipes/clamav/clamav_0.91.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require clamav.inc
-
-SRC_URI += "file://cross-compile-fix.patch;patch=1"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[clamav-0.91.1.md5sum] = "60152bf1e24b3fbdf0473794199e5215"
-SRC_URI[clamav-0.91.1.sha256sum] = "f98edecae40473c142fe49a0e02f5ff7fb28d778c4bd510dad747d208d20cb00"
diff --git a/recipes/clamav/clamav_0.94.2.bb b/recipes/clamav/clamav_0.94.2.bb
deleted file mode 100644
index 6024d0fe6f..0000000000
--- a/recipes/clamav/clamav_0.94.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require clamav.inc
-
-EXTRA_OECONF += "--program-transform-name=''"
-
-PR = "${INC_PR}.1"
-
-do_install_append() {
-	# Remove deprecated options
-	sed -ri "/Archive(Block)?Max/d" ${D}/${sysconfdir}/clamd.conf
-}
-SRC_URI[clamav-0.94.2.md5sum] = "1181e6d62341b84708f126cc353f7ebf"
-SRC_URI[clamav-0.94.2.sha256sum] = "1aec7fecff375958d067aceeb9782d3ff0be7c13bed0eecf6240fb089f8d268c"
diff --git a/recipes/clamav/clamav_0.95.3.bb b/recipes/clamav/clamav_0.95.3.bb
index 37b3b9dbef..7df5a926d3 100644
--- a/recipes/clamav/clamav_0.95.3.bb
+++ b/recipes/clamav/clamav_0.95.3.bb
@@ -5,11 +5,4 @@ SRC_URI += "file://clamav-fix-_SC_PAGESIZE-missing.patch;patch=1"
 SRC_URI[clamav-0.95.3.md5sum] = "eaf9fccc3cc3567605a9732313652967"
 SRC_URI[clamav-0.95.3.sha256sum] = "003e7a570932fdffbd19fa7a7996274fbfc93f890d26c3066a36eb824c906250"
 
-EXTRA_OECONF += "--program-transform-name=''"
-
 PR = "${INC_PR}.1"
-
-do_install_append() {
-	# Remove deprecated options
-	sed -ri "/Archive(Block)?Max/d" ${D}/${sysconfdir}/clamd.conf
-}
diff --git a/recipes/clamav/files/clamd.conf b/recipes/clamav/files/clamd.conf
index 74ebcf5c3f..ec226f2940 100644
--- a/recipes/clamav/files/clamd.conf
+++ b/recipes/clamav/files/clamd.conf
@@ -20,8 +20,3 @@ ScanMail yes
 PhishingSignatures yes
 ScanHTML yes
 ScanArchive yes
-ArchiveMaxRecursion 8
-ArchiveMaxFiles 1000
-ArchiveMaxFileSize 10M
-ArchiveMaxCompressionRatio 250
-ArchiveBlockMax yes