clamav 0.88.4: The optional linksource field in the volatiles file is in

fact mandatory, so add it back. I removed it after noticing other packges
didn't specify it, so they'll also be broken.

diff --git a/packages/clamav/clamav_0.88.4.bb b/packages/clamav/clamav_0.88.4.bb
index 40804a9..c53be83 100644 (file)
--- a/packages/clamav/clamav_0.88.4.bb
+++ b/packages/clamav/clamav_0.88.4.bb
@@ -16,7 +16,7 @@ RDEPENDS_${PN} = "${PN}-data"
 RDEPENDS_${PN}-daemon = "${PN}-data"
 RRECOMMENDS_${PN} = "${PN}-freshclam"
 RRECOMMENDS_${PN}-daemon = "${PN}-freshclam"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \
           file://cross-compile-fix.patch;patch=1 \

diff --git a/packages/clamav/files/volatiles.02_clamav-data b/packages/clamav/files/volatiles.02_clamav-data
index e26c08a..99dc98b 100644 (file)
--- a/packages/clamav/files/volatiles.02_clamav-data
+++ b/packages/clamav/files/volatiles.02_clamav-data
@@ -1,4 +1,4 @@
-# <type> <owner> <group> <mode> <path> [<linksource>]
-d clamav clamav 0755 /var/lib/clamav
+# <type> <owner> <group> <mode> <path> <linksource>
+d clamav clamav 0755 /var/lib/clamav none
 l clamav clamav 0644 /var/lib/clamav/main.cvd /usr/lib/clamav/main.cvd
 l clamav clamav 0644 /var/lib/clamav/daily.cvd /usr/lib/clamav/daily.cvd

diff --git a/packages/clamav/files/volatiles.03_clamav-daemon b/packages/clamav/files/volatiles.03_clamav-daemon
index aeac57a..c5f68e3 100644 (file)
--- a/packages/clamav/files/volatiles.03_clamav-daemon
+++ b/packages/clamav/files/volatiles.03_clamav-daemon
@@ -1,4 +1,4 @@
-# <type> <owner> <group> <mode> <path> [<linksource>]
-d clamav clamav 0775 /var/log/clamav
-d clamav clamav 0755 /var/lib/clamav
-d clamav clamav 0755 /var/run/clamav
\ No newline at end of file
+# <type> <owner> <group> <mode> <path> <linksource>
+d clamav clamav 0775 /var/log/clamav none
+d clamav clamav 0755 /var/lib/clamav none
+d clamav clamav 0755 /var/run/clamav none
\ No newline at end of file

diff --git a/packages/clamav/files/volatiles.03_clamav-freshclam b/packages/clamav/files/volatiles.03_clamav-freshclam
index 3019ea3..db78e3a 100644 (file)
--- a/packages/clamav/files/volatiles.03_clamav-freshclam
+++ b/packages/clamav/files/volatiles.03_clamav-freshclam
@@ -1,4 +1,4 @@
-# <type> <owner> <group> <mode> <path> [<linksource>]
-d clamav clamav 0775 /var/log/clamav
-d clamav clamav 0755 /var/lib/clamav
-d clamav clamav 0755 /var/run/clamav
+# <type> <owner> <group> <mode> <path> <linksource>
+d clamav clamav 0775 /var/log/clamav none
+d clamav clamav 0755 /var/lib/clamav none
+d clamav clamav 0755 /var/run/clamav none