diff options
author | Armin Kuster <akuster808@gmail.com> | 2016-04-11 08:09:53 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2016-04-23 08:03:09 -0700 |
commit | 6636db9dcdf175ba843b14af2844d682b71fdecc (patch) | |
tree | 784a088424f32b8c8fca0fb86afa06c760a0f0a1 | |
parent | 73f384257d54f8189ab31276efd949907c29e75f (diff) | |
download | meta-security-6636db9dcdf175ba843b14af2844d682b71fdecc.tar.gz |
clamav: fix lib version mismatch
drop lib version in package name
drop insane and remove broken symlink
Use LEAD_SONAME
Don't hard code lib version in tasks
Use native chrpath not the host provided version
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/clamav/clamav_0.99.1.bb | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/recipes-security/clamav/clamav_0.99.1.bb b/recipes-security/clamav/clamav_0.99.1.bb index 4b42361..edccc78 100644 --- a/recipes-security/clamav/clamav_0.99.1.bb +++ b/recipes-security/clamav/clamav_0.99.1.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.clamav.net/index.html" | |||
4 | SECTION = "security" | 4 | SECTION = "security" |
5 | LICENSE = "LGPL-2.1" | 5 | LICENSE = "LGPL-2.1" |
6 | 6 | ||
7 | DEPENDS = "libtool db libmspack " | 7 | DEPENDS = "libtool db libmspack chrpath-replacement-native" |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://COPYING.LGPL;beginline=2;endline=3;md5=4b89c05acc71195e9a06edfa2fa7d092" | 9 | LIC_FILES_CHKSUM = "file://COPYING.LGPL;beginline=2;endline=3;md5=4b89c05acc71195e9a06edfa2fa7d092" |
10 | 10 | ||
@@ -18,6 +18,11 @@ SRC_URI = "http://www.clamav.net/downloads/production/${BPN}-${PV}.tar.gz \ | |||
18 | SRC_URI[md5sum] = "cf1f3cbe62a08c9165801f79239166ff" | 18 | SRC_URI[md5sum] = "cf1f3cbe62a08c9165801f79239166ff" |
19 | SRC_URI[sha256sum] = "e144689122d3f91293808c82cbb06b7d3ac9eca7ae29564c5d148ffe7b25d58a" | 19 | SRC_URI[sha256sum] = "e144689122d3f91293808c82cbb06b7d3ac9eca7ae29564c5d148ffe7b25d58a" |
20 | 20 | ||
21 | LEAD_SONAME = "libclamav.so" | ||
22 | SO_VER = "7.1.1" | ||
23 | |||
24 | EXTRANATIVEPATH += "chrpath-native" | ||
25 | |||
21 | inherit autotools-brokensep pkgconfig useradd systemd | 26 | inherit autotools-brokensep pkgconfig useradd systemd |
22 | 27 | ||
23 | UID = "clamav" | 28 | UID = "clamav" |
@@ -53,7 +58,7 @@ do_configure () { | |||
53 | 58 | ||
54 | do_compile_append() { | 59 | do_compile_append() { |
55 | # brute force removing RPATH | 60 | # brute force removing RPATH |
56 | chrpath -d ${B}/libclamav/.libs/libclamav.so.7.1.1 | 61 | chrpath -d ${B}/libclamav/.libs/libclamav.so.${SO_VER} |
57 | chrpath -d ${B}/sigtool/.libs/sigtool | 62 | chrpath -d ${B}/sigtool/.libs/sigtool |
58 | chrpath -d ${B}/clambc/.libs/clambc | 63 | chrpath -d ${B}/clambc/.libs/clambc |
59 | chrpath -d ${B}/clamscan/.libs/clamscan | 64 | chrpath -d ${B}/clamscan/.libs/clamscan |
@@ -71,6 +76,7 @@ do_install_append() { | |||
71 | install -m 644 ${WORKDIR}/freshclam.conf ${D}/${sysconfdir} | 76 | install -m 644 ${WORKDIR}/freshclam.conf ${D}/${sysconfdir} |
72 | install -m 0644 ${WORKDIR}/volatiles.03_clamav ${D}${sysconfdir}/default/volatiles/volatiles.03_clamav | 77 | install -m 0644 ${WORKDIR}/volatiles.03_clamav ${D}${sysconfdir}/default/volatiles/volatiles.03_clamav |
73 | sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc | 78 | sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/libclamav.pc |
79 | rm ${D}/${libdir}/libclamav.so | ||
74 | } | 80 | } |
75 | 81 | ||
76 | pkg_postinst_${PN} () { | 82 | pkg_postinst_${PN} () { |
@@ -82,7 +88,7 @@ pkg_postinst_${PN} () { | |||
82 | 88 | ||
83 | 89 | ||
84 | PACKAGES = "${PN} ${PN}-dev ${PN}-dbg ${PN}-daemon ${PN}-doc \ | 90 | PACKAGES = "${PN} ${PN}-dev ${PN}-dbg ${PN}-daemon ${PN}-doc \ |
85 | ${PN}-clamdscan ${PN}-freshclam ${PN}-libclamav6 ${PN}-staticdev" | 91 | ${PN}-clamdscan ${PN}-freshclam ${PN}-libclamav ${PN}-staticdev" |
86 | 92 | ||
87 | FILES_${PN} = "${bindir}/clambc ${bindir}/clamscan ${bindir}/clamsubmit \ | 93 | FILES_${PN} = "${bindir}/clambc ${bindir}/clamscan ${bindir}/clamsubmit \ |
88 | ${bindir}/*sigtool ${mandir}/man1/clambc* ${mandir}/man1/clamscan* \ | 94 | ${bindir}/*sigtool ${mandir}/man1/clambc* ${mandir}/man1/clamscan* \ |
@@ -116,15 +122,13 @@ FILES_${PN}-dev = " ${bindir}/clamav-config ${libdir}/*.la \ | |||
116 | 122 | ||
117 | FILES_${PN}-staticdev = "${libdir}/*.a" | 123 | FILES_${PN}-staticdev = "${libdir}/*.a" |
118 | 124 | ||
119 | FILES_${PN}-libclamav6 = "${libdir}/libclamav.so* ${libdir}/libmspack.so*\ | 125 | FILES_${PN}-libclamav = "${libdir}/libclamav.so* ${libdir}/libmspack.so*\ |
120 | ${docdir}/libclamav6/* " | 126 | ${docdir}/libclamav/* " |
121 | 127 | ||
122 | FILES_${PN}-doc = "${mandir}/man/* \ | 128 | FILES_${PN}-doc = "${mandir}/man/* \ |
123 | ${datadir}/man/* \ | 129 | ${datadir}/man/* \ |
124 | ${docdir}/* " | 130 | ${docdir}/* " |
125 | 131 | ||
126 | INSANE_SKIP_${PN}-libclamav6 = "dev-so" | ||
127 | |||
128 | USERADD_PACKAGES = "${PN}" | 132 | USERADD_PACKAGES = "${PN}" |
129 | GROUPADD_PARAM_${PN} = "--system ${UID}" | 133 | GROUPADD_PARAM_${PN} = "--system ${UID}" |
130 | USERADD_PARAM_${PN} = "--system -g ${GID} --home-dir \ | 134 | USERADD_PARAM_${PN} = "--system -g ${GID} --home-dir \ |
@@ -136,4 +140,4 @@ RREPLACES_${PN} += "${PN}-systemd" | |||
136 | RCONFLICTS_${PN} += "${PN}-systemd" | 140 | RCONFLICTS_${PN} += "${PN}-systemd" |
137 | SYSTEMD_SERVICE_${PN} = "${BPN}.service" | 141 | SYSTEMD_SERVICE_${PN} = "${BPN}.service" |
138 | 142 | ||
139 | RDEPENDS_${PN} += "openssl ncurses-libncurses libbz2 ncurses-libtinfo clamav-freshclam clamav-libclamav6" | 143 | RDEPENDS_${PN} += "openssl ncurses-libncurses libbz2 ncurses-libtinfo clamav-freshclam clamav-libclamav" |