summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-06-24 16:58:20 -0700
committerArmin Kuster <akuster808@gmail.com>2020-01-03 11:54:58 -0800
commit912ead8099db391a872d5c686f4bff8ed74c98e7 (patch)
treead3cc9888abae950ca74410baf5f26b6f468fccf
parent6400eba66a328db21d284f4d77e65ee1608cec00 (diff)
downloadmeta-security-912ead8099db391a872d5c686f4bff8ed74c98e7.tar.gz
clamav: update to 0.101.5
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-security/clamav/clamav_0.101.5.bb (renamed from recipes-security/clamav/clamav_0.99.4.bb)63
1 files changed, 24 insertions, 39 deletions
diff --git a/recipes-security/clamav/clamav_0.99.4.bb b/recipes-security/clamav/clamav_0.101.5.bb
index a340b48..a4c32e1 100644
--- a/recipes-security/clamav/clamav_0.99.4.bb
+++ b/recipes-security/clamav/clamav_0.101.5.bb
@@ -4,14 +4,14 @@ HOMEPAGE = "http://www.clamav.net/index.html"
4SECTION = "security" 4SECTION = "security"
5LICENSE = "LGPL-2.1" 5LICENSE = "LGPL-2.1"
6 6
7DEPENDS = "libtool db libmspack openssl zlib llvm chrpath-replacement-native clamav-native" 7DEPENDS = "libtool db libxml2 openssl zlib curl llvm clamav-native libmspack"
8DEPENDS_class-native = "db-native openssl-native zlib-native" 8DEPENDS_class-native = "db-native openssl-native zlib-native llvm-native curl-native"
9 9
10LIC_FILES_CHKSUM = "file://COPYING.LGPL;beginline=2;endline=3;md5=4b89c05acc71195e9a06edfa2fa7d092" 10LIC_FILES_CHKSUM = "file://COPYING.LGPL;beginline=2;endline=3;md5=4b89c05acc71195e9a06edfa2fa7d092"
11 11
12SRCREV = "b66e5e27b48c0a07494f9df9b809ed933cede047" 12SRCREV = "482fcd413b07e9fd3ef9850e6d01a45f4e187108"
13 13
14SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=rel/0.99 \ 14SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=rel/0.101 \
15 file://clamd.conf \ 15 file://clamd.conf \
16 file://freshclam.conf \ 16 file://freshclam.conf \
17 file://volatiles.03_clamav \ 17 file://volatiles.03_clamav \
@@ -23,20 +23,14 @@ SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=rel/0.99 \
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
24 24
25LEAD_SONAME = "libclamav.so" 25LEAD_SONAME = "libclamav.so"
26SO_VER = "7.1.1" 26SO_VER = "9.0.2"
27 27
28EXTRANATIVEPATH += "chrpath-native" 28inherit autotools pkgconfig useradd systemd
29 29
30inherit autotools-brokensep pkgconfig useradd systemd 30CLAMAV_UID ?= "clamav"
31 31CLAMAV_GID ?= "clamav"
32UID = "clamav"
33GID = "clamav"
34INSTALL_CLAMAV_CVD ?= "1" 32INSTALL_CLAMAV_CVD ?= "1"
35 33
36# Clamav has a built llvm version 2 but does not build with gcc 6.x,
37# disable the internal one. This is a known issue
38# If you want LLVM support, use the one in core
39
40CLAMAV_USR_DIR = "${STAGING_DIR_NATIVE}/usr" 34CLAMAV_USR_DIR = "${STAGING_DIR_NATIVE}/usr"
41CLAMAV_USR_DIR_class-target = "${STAGING_DIR_HOST}/usr" 35CLAMAV_USR_DIR_class-target = "${STAGING_DIR_HOST}/usr"
42 36
@@ -45,49 +39,40 @@ PACKAGECONFIG_class-target += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6",
45PACKAGECONFIG_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 39PACKAGECONFIG_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
46 40
47PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_LIBDIR}, --without-pcre, libpcre" 41PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_LIBDIR}, --without-pcre, libpcre"
48PACKAGECONFIG[xml] = "--with-xml=${CLAMAV_USR_DIR}, --disable-xml, libxml2," 42PACKAGECONFIG[json] = "--with-libjson=${STAGING_LIBDIR}, --without-libjson, json-c,"
49PACKAGECONFIG[json] = "--with-libjson=${STAGING_LIBDIR}, --without-libjson, json,"
50PACKAGECONFIG[curl] = "--with-libcurl=${STAGING_LIBDIR}, --without-libcurl, curl,"
51PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" 43PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6"
52PACKAGECONFIG[bz2] = "--with-libbz2-prefix=${CLAMAV_USR_DIR}, --without-libbz2-prefix, " 44PACKAGECONFIG[bz2] = "--with-libbz2-prefix=${CLAMAV_USR_DIR}, --disable-bzip2, bzip2"
53PACKAGECONFIG[ncurses] = "--with-libncurses-prefix=${CLAMAV_USR_DIR}, --without-libncurses-prefix, ncurses, " 45PACKAGECONFIG[ncurses] = "--with-libncurses-prefix=${CLAMAV_USR_DIR}, --without-libncurses-prefix, ncurses, "
54PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemdsystemunitdir, " 46PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemdsystemunitdir, "
55 47
56EXTRA_OECONF_CLAMAV = "--without-libcheck-prefix --disable-unrar \ 48EXTRA_OECONF_CLAMAV = "--without-libcheck-prefix --disable-unrar \
57 --with-system-llvm --with-llvm-linking=dynamic --disable-llvm \
58 --disable-mempool \ 49 --disable-mempool \
59 --program-prefix="" \ 50 --program-prefix="" \
60 --disable-yara \ 51 --disable-zlib-vcheck \
61 --disable-xml \ 52 --with-xml=${CLAMAV_USR_DIR} \
53 --with-zlib=${CLAMAV_USR_DIR} \
62 --with-openssl=${CLAMAV_USR_DIR} \ 54 --with-openssl=${CLAMAV_USR_DIR} \
63 --with-zlib=${CLAMAV_USR_DIR} --disable-zlib-vcheck \ 55 --with-libcurl=${CLAMAV_USR_DIR} \
56 --with-system-libmspack=${CLAMAV_USR_DIR} \
57 --with-iconv=no \
58 --enable-check=no \
64 " 59 "
65 60
66EXTRA_OECONF_class-native += "${EXTRA_OECONF_CLAMAV}" 61EXTRA_OECONF_class-native += "${EXTRA_OECONF_CLAMAV}"
67EXTRA_OECONF_class-target += "--with-user=${UID} --with-group=${GID} --disable-rpath ${EXTRA_OECONF_CLAMAV}" 62EXTRA_OECONF_class-target += "--with-user=${CLAMAV_UID} --with-group=${CLAMAV_GID} ${EXTRA_OECONF_CLAMAV}"
68 63
69do_configure () { 64do_configure () {
70 ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} 65 ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
71 install -d ${S}/clamav_db
72} 66}
73 67
74do_configure_class-native () { 68do_configure_class-native () {
75 ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} 69 ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
76} 70}
77 71
78
79do_compile_append_class-target() { 72do_compile_append_class-target() {
80 # brute force removing RPATH
81 chrpath -d ${B}/libclamav/.libs/libclamav.so.${SO_VER}
82 chrpath -d ${B}/sigtool/.libs/sigtool
83 chrpath -d ${B}/clambc/.libs/clambc
84 chrpath -d ${B}/clamscan/.libs/clamscan
85 chrpath -d ${B}/clamconf/.libs/clamconf
86 chrpath -d ${B}/clamd/.libs/clamd
87 chrpath -d ${B}/freshclam/.libs/freshclam
88
89 if [ "${INSTALL_CLAMAV_CVD}" = "1" ]; then 73 if [ "${INSTALL_CLAMAV_CVD}" = "1" ]; then
90 bbnote "CLAMAV creating cvd" 74 bbnote "CLAMAV creating cvd"
75 install -d ${S}/clamav_db
91 ${STAGING_BINDIR_NATIVE}/freshclam --datadir=${S}/clamav_db --config=${WORKDIR}/freshclam-native.conf 76 ${STAGING_BINDIR_NATIVE}/freshclam --datadir=${S}/clamav_db --config=${WORKDIR}/freshclam-native.conf
92 fi 77 fi
93} 78}
@@ -117,7 +102,7 @@ pkg_postinst_ontarget_${PN} () {
117 ${sysconfdir}/init.d/populate-volatile.sh update 102 ${sysconfdir}/init.d/populate-volatile.sh update
118 fi 103 fi
119 mkdir -p ${localstatedir}/lib/clamav 104 mkdir -p ${localstatedir}/lib/clamav
120 chown -R ${UID}:${GID} ${localstatedir}/lib/clamav 105 chown -R ${CLAMAV_UID}:${CLAMAV_GID} ${localstatedir}/lib/clamav
121} 106}
122 107
123 108
@@ -158,7 +143,7 @@ FILES_${PN}-dev = " ${bindir}/clamav-config ${libdir}/*.la \
158 143
159FILES_${PN}-staticdev = "${libdir}/*.a" 144FILES_${PN}-staticdev = "${libdir}/*.a"
160 145
161FILES_${PN}-libclamav = "${libdir}/libclamav.so* ${libdir}/libmspack.so*\ 146FILES_${PN}-libclamav = "${libdir}/libclamav.so* ${libdir}/libclammspack.so*\
162 ${docdir}/libclamav/* " 147 ${docdir}/libclamav/* "
163 148
164FILES_${PN}-doc = "${mandir}/man/* \ 149FILES_${PN}-doc = "${mandir}/man/* \
@@ -168,8 +153,8 @@ FILES_${PN}-doc = "${mandir}/man/* \
168FILES_${PN}-cvd = "${localstatedir}/lib/clamav/*.cvd ${localstatedir}/lib/clamav/*.dat" 153FILES_${PN}-cvd = "${localstatedir}/lib/clamav/*.cvd ${localstatedir}/lib/clamav/*.dat"
169 154
170USERADD_PACKAGES = "${PN}" 155USERADD_PACKAGES = "${PN}"
171GROUPADD_PARAM_${PN} = "--system ${UID}" 156GROUPADD_PARAM_${PN} = "--system ${CLAMAV_UID}"
172USERADD_PARAM_${PN} = "--system -g ${GID} --home-dir \ 157USERADD_PARAM_${PN} = "--system -g ${CLAMAV_GID} --home-dir \
173 ${localstatedir}/spool/${BPN} \ 158 ${localstatedir}/spool/${BPN} \
174 --no-create-home --shell /bin/false ${BPN}" 159 --no-create-home --shell /bin/false ${BPN}"
175 160
@@ -178,7 +163,7 @@ RREPLACES_${PN} += "${PN}-systemd"
178RCONFLICTS_${PN} += "${PN}-systemd" 163RCONFLICTS_${PN} += "${PN}-systemd"
179SYSTEMD_SERVICE_${PN} = "${BPN}.service" 164SYSTEMD_SERVICE_${PN} = "${BPN}.service"
180 165
181RDEPENDS_${PN} = "openssl ncurses-libncurses libbz2 ncurses-libtinfo clamav-freshclam clamav-libclamav" 166RDEPENDS_${PN} = "openssl ncurses-libncurses libxml2 libbz2 ncurses-libtinfo curl libpcre2 clamav-freshclam clamav-libclamav"
182RDEPENDS_${PN}_class-native = "" 167RDEPENDS_${PN}_class-native = ""
183 168
184BBCLASSEXTEND = "native" 169BBCLASSEXTEND = "native"