Re: [yocto] [meta-security][PATCH] samhain-standalone: fix buildpaths issue

[akuster808 <akuster808@gmail.com>]

merged

On 8/11/22 02:40, Yu, Mingli wrote:
> From: Mingli Yu <mingli.yu@windriver.com>
>
> Fixes:
>    WARNING: samhain-standalone-4.4.9-r0 do_package_qa: QA Issue: File /usr/share/doc/samhain-standalone/scripts/samhain.ebuild-light in package samhain-standalone-doc contains reference to TMPDIR
>    File /usr/share/doc/samhain-standalone/scripts/samhain.ebuild in package samhain-standalone-doc contains reference to TMPDIR [buildpaths]
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
>   .../0001-Don-t-expose-configure-args.patch    | 44 +++++++++++++++++++
>   recipes-ids/samhain/samhain-standalone.bb     |  1 +
>   2 files changed, 45 insertions(+)
>   create mode 100644 recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch
>
> diff --git a/recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch b/recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch
> new file mode 100644
> index 0000000..fedbe5b
> --- /dev/null
> +++ b/recipes-ids/samhain/files/0001-Don-t-expose-configure-args.patch
> @@ -0,0 +1,44 @@
> +From 111b1e8f35e989513d8961a45a806767109f6e1e Mon Sep 17 00:00:00 2001
> +From: Mingli Yu <mingli.yu@windriver.com>
> +Date: Thu, 11 Aug 2022 17:15:30 +0800
> +Subject: [PATCH] Don't expose configure args
> +
> +Don't expost configure args to fix buildpath issue.
> +
> +Upstream-Status: Inappropriate [oe specific]
> +
> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> +---
> + scripts/samhain.ebuild-light.in | 2 +-
> + scripts/samhain.ebuild.in       | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/scripts/samhain.ebuild-light.in b/scripts/samhain.ebuild-light.in
> +index 2b09cdb..b7f7062 100644
> +--- a/scripts/samhain.ebuild-light.in
> ++++ b/scripts/samhain.ebuild-light.in
> +@@ -55,7 +55,7 @@ src_compile() {
> + #	      --with-state-dir=/var/lib/${PN} \
> + #	      --with-log-file=/var/log/${PN}.log \
> +
> +-	./configure ${myconf} @mydefargs@ || die
> ++	./configure ${myconf} mydefargs || die
> +         emake || die
> +
> + 	echo '#!/bin/sh' > ./sstrip
> +diff --git a/scripts/samhain.ebuild.in b/scripts/samhain.ebuild.in
> +index 635a746..b9a42e7 100644
> +--- a/scripts/samhain.ebuild.in
> ++++ b/scripts/samhain.ebuild.in
> +@@ -55,7 +55,7 @@ src_compile() {
> + #	      --with-state-dir=/var/lib/${PN} \
> + #	      --with-log-file=/var/log/${PN}.log \
> +
> +-	./configure ${myconf} @mydefargs@ || die
> ++	./configure ${myconf} mydefargs || die
> +         emake || die
> +
> + 	echo '#!/bin/sh' > ./sstrip
> +--
> +2.25.1
> +
> diff --git a/recipes-ids/samhain/samhain-standalone.bb b/recipes-ids/samhain/samhain-standalone.bb
> index 445cb99..b832dc8 100644
> --- a/recipes-ids/samhain/samhain-standalone.bb
> +++ b/recipes-ids/samhain/samhain-standalone.bb
> @@ -1,6 +1,7 @@
>   require samhain.inc
>   
>   SRC_URI += "file://samhain-not-run-ptest-on-host.patch \
> +            file://0001-Don-t-expose-configure-args.patch \
>               file://run-ptest \
>   "
>   
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#57824): https://lists.yoctoproject.org/g/yocto/message/57824
> Mute This Topic: https://lists.yoctoproject.org/mt/92955016/3616698
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>