Skip to contentSkip to conversation

suricata: unify volatiles file name

PATCH In review Yi Zhao 2 participants 4 messages Nov 2, 2020 – Nov 4, 2020

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/2 suricata: unify volatiles file name

Make the volatiles file name starts with digital.

---
 recipes-ids/suricata/suricata_4.1.9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-ids/suricata/suricata_4.1.9.bb +1 -1
index 135871c..3f7beaa 100644
@@ -55,7 +55,7 @@ do_install_append () {
     oe_runmake install-rules DESTDIR=${D}
 
     install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles
-    install -m 0644 ${WORKDIR}/volatiles.03_suricata  ${D}${sysconfdir}/default/volatiles/volatiles.03_suricata
+    install -m 0644 ${WORKDIR}/volatiles.03_suricata  ${D}${sysconfdir}/default/volatiles/03_suricata
 
     install -m 0644 ${S}/threshold.config ${D}${sysconfdir}/suricata
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 clamav: unify volatiles file name

Make the volatiles file name starts with digital.

---
 recipes-scanners/clamav/clamav_0.101.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-scanners/clamav/clamav_0.101.5.bb +1 -1
index 47fbae4..7dad263 100644
@@ -86,7 +86,7 @@ do_install_append_class-target () {
 
     install -m 644 ${WORKDIR}/clamd.conf ${D}/${sysconfdir}
     install -m 644 ${WORKDIR}/freshclam.conf ${D}/${sysconfdir}
-    install -m 0644 ${WORKDIR}/volatiles.03_clamav  ${D}${sysconfdir}/default/volatiles/volatiles.03_clamav
+    install -m 0644 ${WORKDIR}/volatiles.03_clamav  ${D}${sysconfdir}/default/volatiles/03_clamav
     sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc
     rm ${D}/${libdir}/libclamav.so
     if [ "${INSTALL_CLAMAV_CVD}" = "1" ]; then
Signature · 1 line
2.17.1
#2 lore raw

Re: [yocto] [meta-security][PATCH 2/2] clamav: unify volatiles file name

merged
thanks

Quoted 23 lines · Yi Zhao

Make the volatiles file name starts with digital.

---
 recipes-scanners/clamav/clamav_0.101.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-scanners/clamav/clamav_0.101.5.bb +1 -1
index 47fbae4..7dad263 100644
@@ -86,7 +86,7 @@ do_install_append_class-target () {
 
     install -m 644 ${WORKDIR}/clamd.conf ${D}/${sysconfdir}
     install -m 644 ${WORKDIR}/freshclam.conf ${D}/${sysconfdir}
-    install -m 0644 ${WORKDIR}/volatiles.03_clamav  ${D}${sysconfdir}/default/volatiles/volatiles.03_clamav
+    install -m 0644 ${WORKDIR}/volatiles.03_clamav  ${D}${sysconfdir}/default/volatiles/03_clamav
     sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc
     rm ${D}/${libdir}/libclamav.so
     if [ "${INSTALL_CLAMAV_CVD}" = "1" ]; then
#3 lore raw
In reply to Yi Zhao
Quoted 1 line · Yi Zhao

Make the volatiles file name starts with digital.

merged

thanks

Quoted 22 lines
---
 recipes-ids/suricata/suricata_4.1.9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-ids/suricata/suricata_4.1.9.bb +1 -1
index 135871c..3f7beaa 100644
@@ -55,7 +55,7 @@ do_install_append () {
     oe_runmake install-rules DESTDIR=${D}
 
     install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles
-    install -m 0644 ${WORKDIR}/volatiles.03_suricata  ${D}${sysconfdir}/default/volatiles/volatiles.03_suricata
+    install -m 0644 ${WORKDIR}/volatiles.03_suricata  ${D}${sysconfdir}/default/volatiles/03_suricata
 
     install -m 0644 ${S}/threshold.config ${D}${sysconfdir}/suricata