aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-08-09 15:07:31 +0800
committerKhem Raj <raj.khem@gmail.com>2019-08-11 08:58:05 -0700
commit493aa5b8967f632912acc5d9becf97e50f93cbd1 (patch)
tree983f1f5a6b43570c4b517d903ff3abe03c7179ab
parent58c865e46d1431ea6aad1ab24452f9bb3992f1b0 (diff)
downloadmeta-openembedded-493aa5b8967f632912acc5d9becf97e50f93cbd1.tar.gz
snort: upgrade 2.9.14 -> 2.9.14.1
Add volatile conf to create log directory. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/snort/snort/volatiles.99_snort2
-rw-r--r--meta-networking/recipes-connectivity/snort/snort_2.9.14.1.bb (renamed from meta-networking/recipes-connectivity/snort/snort_2.9.14.bb)16
2 files changed, 14 insertions, 4 deletions
diff --git a/meta-networking/recipes-connectivity/snort/snort/volatiles.99_snort b/meta-networking/recipes-connectivity/snort/snort/volatiles.99_snort
new file mode 100644
index 0000000000..acf5f61ab6
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/snort/volatiles.99_snort
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d root root 0755 /var/log/snort none
diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.14.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.14.1.bb
index 6ead49bb61..892fe4d4cd 100644
--- a/meta-networking/recipes-connectivity/snort/snort_2.9.14.bb
+++ b/meta-networking/recipes-connectivity/snort/snort_2.9.14.1.bb
@@ -8,6 +8,7 @@ DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-n
SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \
file://snort.init \
+ file://volatiles.99_snort \
file://0001-libpcap-search-sysroot-for-headers.patch \
file://fix-host-contamination-when-enable-static-daq.patch \
file://disable-run-test-program-while-cross-compiling.patch \
@@ -15,8 +16,8 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \
file://0001-chdeck-for-gettid-API-during-configure.patch \
"
-SRC_URI[md5sum] = "d1689c7ccaaa7bfcfa83b5bff6b8f9b8"
-SRC_URI[sha256sum] = "c0306db9ce64f45cc7c64c9afc70abe9689daa860020345ec3ba099928b7464b"
+SRC_URI[md5sum] = "009254a9797ec93321c5936b99dcd6c8"
+SRC_URI[sha256sum] = "2472989da3aace000d1ea5931ece68f8e5cc0c511e272d65182113a2481e822d"
UPSTREAM_CHECK_URI = "https://www.snort.org/downloads"
UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -72,12 +73,19 @@ do_install_append() {
cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/
install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort
- mkdir -p ${D}${localstatedir}/log/snort
- install -d ${D}/var/log/snort
+
+ install -d ${D}${sysconfdir}/default/volatiles
+ install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort
sed -i -e 's|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc
}
+pkg_postinst_${PN}() {
+ if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
+ ${sysconfdir}/init.d/populate-volatile.sh update
+ fi
+}
+
FILES_${PN} += " \
${libdir}/snort_dynamicengine/*.so.* \
${libdir}/snort_dynamicpreprocessor/*.so.* \