* [meta-security][master|dunfell][PATCH 1/2] clamav: resolve multilib issues
@ 2020-06-13 2:19 Jeremy Puhlman
2020-06-13 2:19 ` [meta-security][master|dunfell][PATCH 2/2] tripwire: Remove makefiles from the man directories Jeremy Puhlman
2020-06-19 23:42 ` [yocto] [meta-security][master|dunfell][PATCH 1/2] clamav: resolve multilib issues Armin Kuster
0 siblings, 2 replies; 4+ messages in thread
From: Jeremy Puhlman @ 2020-06-13 2:19 UTC (permalink / raw)
To: yocto; +Cc: Jeremy Puhlman
From: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
recipes-scanners/clamav/clamav_0.101.5.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/recipes-scanners/clamav/clamav_0.101.5.bb b/recipes-scanners/clamav/clamav_0.101.5.bb
index f4625b1..2ea2c9b 100644
--- a/recipes-scanners/clamav/clamav_0.101.5.bb
+++ b/recipes-scanners/clamav/clamav_0.101.5.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
LEAD_SONAME = "libclamav.so"
SO_VER = "9.0.2"
-inherit autotools pkgconfig useradd systemd
+inherit autotools pkgconfig useradd systemd multilib_header multilib_script
CLAMAV_UID ?= "clamav"
CLAMAV_GID ?= "clamav"
@@ -45,6 +45,8 @@ PACKAGECONFIG[bz2] = "--with-libbz2-prefix=${CLAMAV_USR_DIR}, --disable-bzip2, b
PACKAGECONFIG[ncurses] = "--with-libncurses-prefix=${CLAMAV_USR_DIR}, --without-libncurses-prefix, ncurses, "
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemdsystemunitdir, "
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/clamav-config ${PN}-cvd:${localstatedir}/lib/clamav/mirrors.dat"
+
EXTRA_OECONF_CLAMAV = "--without-libcheck-prefix --disable-unrar \
--disable-mempool \
--program-prefix="" \
@@ -93,6 +95,7 @@ do_install_append_class-target () {
install -d ${D}${sysconfdir}/tmpfiles.d
install -m 0644 ${WORKDIR}/tmpfiles.clamav ${D}${sysconfdir}/tmpfiles.d/clamav.conf
fi
+ oe_multilib_header clamav-types.h
}
pkg_postinst_ontarget_${PN} () {
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-security][master|dunfell][PATCH 2/2] tripwire: Remove makefiles from the man directories.
2020-06-13 2:19 [meta-security][master|dunfell][PATCH 1/2] clamav: resolve multilib issues Jeremy Puhlman
@ 2020-06-13 2:19 ` Jeremy Puhlman
2020-06-19 23:43 ` [yocto] " Armin Kuster
2020-06-19 23:42 ` [yocto] [meta-security][master|dunfell][PATCH 1/2] clamav: resolve multilib issues Armin Kuster
1 sibling, 1 reply; 4+ messages in thread
From: Jeremy Puhlman @ 2020-06-13 2:19 UTC (permalink / raw)
To: yocto; +Cc: Jeremy Puhlman
From: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
recipes-ids/tripwire/tripwire_2.4.3.7.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-ids/tripwire/tripwire_2.4.3.7.bb b/recipes-ids/tripwire/tripwire_2.4.3.7.bb
index c26392a..4f50bff 100644
--- a/recipes-ids/tripwire/tripwire_2.4.3.7.bb
+++ b/recipes-ids/tripwire/tripwire_2.4.3.7.bb
@@ -52,6 +52,7 @@ do_install () {
install -m 0644 ${S}/man/man4/* ${D}${mandir}/man4
install -m 0644 ${S}/man/man5/* ${D}${mandir}/man5
install -m 0644 ${S}/man/man8/* ${D}${mandir}/man8
+ rm ${D}${mandir}/man*/Makefile*
install -m 0644 ${S}/policy/templates/* ${D}${docdir}/${BPN}/templates
install -m 0644 ${S}/policy/*txt ${D}${docdir}/${BPN}
install -m 0644 ${S}/COPYING ${D}${docdir}/${BPN}
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [yocto] [meta-security][master|dunfell][PATCH 1/2] clamav: resolve multilib issues
2020-06-13 2:19 [meta-security][master|dunfell][PATCH 1/2] clamav: resolve multilib issues Jeremy Puhlman
2020-06-13 2:19 ` [meta-security][master|dunfell][PATCH 2/2] tripwire: Remove makefiles from the man directories Jeremy Puhlman
@ 2020-06-19 23:42 ` Armin Kuster
1 sibling, 0 replies; 4+ messages in thread
From: Armin Kuster @ 2020-06-19 23:42 UTC (permalink / raw)
To: Jeremy Puhlman, yocto
[-- Attachment #1: Type: text/plain, Size: 1740 bytes --]
merged to both.
thanks
armin
On 6/12/20 7:19 PM, Jeremy Puhlman wrote:
> From: Jeremy Puhlman <jpuhlman@mvista.com>
>
> Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
> ---
> recipes-scanners/clamav/clamav_0.101.5.bb | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-scanners/clamav/clamav_0.101.5.bb b/recipes-scanners/clamav/clamav_0.101.5.bb
> index f4625b1..2ea2c9b 100644
> --- a/recipes-scanners/clamav/clamav_0.101.5.bb
> +++ b/recipes-scanners/clamav/clamav_0.101.5.bb
> @@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
> LEAD_SONAME = "libclamav.so"
> SO_VER = "9.0.2"
>
> -inherit autotools pkgconfig useradd systemd
> +inherit autotools pkgconfig useradd systemd multilib_header multilib_script
>
> CLAMAV_UID ?= "clamav"
> CLAMAV_GID ?= "clamav"
> @@ -45,6 +45,8 @@ PACKAGECONFIG[bz2] = "--with-libbz2-prefix=${CLAMAV_USR_DIR}, --disable-bzip2, b
> PACKAGECONFIG[ncurses] = "--with-libncurses-prefix=${CLAMAV_USR_DIR}, --without-libncurses-prefix, ncurses, "
> PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemdsystemunitdir, "
>
> +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/clamav-config ${PN}-cvd:${localstatedir}/lib/clamav/mirrors.dat"
> +
> EXTRA_OECONF_CLAMAV = "--without-libcheck-prefix --disable-unrar \
> --disable-mempool \
> --program-prefix="" \
> @@ -93,6 +95,7 @@ do_install_append_class-target () {
> install -d ${D}${sysconfdir}/tmpfiles.d
> install -m 0644 ${WORKDIR}/tmpfiles.clamav ${D}${sysconfdir}/tmpfiles.d/clamav.conf
> fi
> + oe_multilib_header clamav-types.h
> }
>
> pkg_postinst_ontarget_${PN} () {
>
>
[-- Attachment #2: Type: text/html, Size: 2330 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [yocto] [meta-security][master|dunfell][PATCH 2/2] tripwire: Remove makefiles from the man directories.
2020-06-13 2:19 ` [meta-security][master|dunfell][PATCH 2/2] tripwire: Remove makefiles from the man directories Jeremy Puhlman
@ 2020-06-19 23:43 ` Armin Kuster
0 siblings, 0 replies; 4+ messages in thread
From: Armin Kuster @ 2020-06-19 23:43 UTC (permalink / raw)
To: Jeremy Puhlman, yocto
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
merged
On 6/12/20 7:19 PM, Jeremy Puhlman wrote:
> From: Jeremy Puhlman <jpuhlman@mvista.com>
>
> Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
> ---
> recipes-ids/tripwire/tripwire_2.4.3.7.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/recipes-ids/tripwire/tripwire_2.4.3.7.bb b/recipes-ids/tripwire/tripwire_2.4.3.7.bb
> index c26392a..4f50bff 100644
> --- a/recipes-ids/tripwire/tripwire_2.4.3.7.bb
> +++ b/recipes-ids/tripwire/tripwire_2.4.3.7.bb
> @@ -52,6 +52,7 @@ do_install () {
> install -m 0644 ${S}/man/man4/* ${D}${mandir}/man4
> install -m 0644 ${S}/man/man5/* ${D}${mandir}/man5
> install -m 0644 ${S}/man/man8/* ${D}${mandir}/man8
> + rm ${D}${mandir}/man*/Makefile*
> install -m 0644 ${S}/policy/templates/* ${D}${docdir}/${BPN}/templates
> install -m 0644 ${S}/policy/*txt ${D}${docdir}/${BPN}
> install -m 0644 ${S}/COPYING ${D}${docdir}/${BPN}
>
>
[-- Attachment #2: Type: text/html, Size: 1550 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-19 23:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-13 2:19 [meta-security][master|dunfell][PATCH 1/2] clamav: resolve multilib issues Jeremy Puhlman
2020-06-13 2:19 ` [meta-security][master|dunfell][PATCH 2/2] tripwire: Remove makefiles from the man directories Jeremy Puhlman
2020-06-19 23:43 ` [yocto] " Armin Kuster
2020-06-19 23:42 ` [yocto] [meta-security][master|dunfell][PATCH 1/2] clamav: resolve multilib issues Armin Kuster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.