diff mbox series

[meta-security,1/4] openscap: update to 1.4.2

Message ID 20251114-openscap_bump-v1-1-1c8169b8e332@non.se.com
State New
Headers show
Series openscap: upgrade 1.4.1 to 1.4.2 with fixes | expand

Commit Message

Louis Rannou Nov. 14, 2025, 8:29 a.m. UTC 
From: Louis Rannou <louis.rannou@non.se.com>

SRC_URI is based on the github release instead of the SHA for more efficiency.

Extra fix:
  - typo in the RDEPENDS class-target override ('-' instead of ':')
  - typo SUMARRY -> SUMMARY

New in 1.4.2 (2025-04-06):
  https://github.com/OpenSCAP/openscap/releases/tag/1.4.2

  - Maintenance, bug fix
    - Fix thread synchronization bugs
    - Fix textfilecontent54_probe behaviour for negative instance numbers
    - Fix signature obtaining in rpm_info probe

Signed-off-by: Louis Rannou <louis.rannou@non.se.com>

fix
---
 .../openscap/{openscap_1.4.1.bb => openscap_1.4.2.bb}       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Comments

Clayton Casciato Nov. 14, 2025, 1:23 p.m. UTC | #1 
On 11/14/25 1:29 AM, Louis Rannou via lists.yoctoproject.org wrote:
> From: Louis Rannou <louis.rannou@non.se.com>
>@
> SRC_URI is based on the github release instead of the SHA for more efficiency.
> [...]
> -SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=main;protocol=https \
> -           file://0001-CMakeLists.txt-fix-installation-directory-for-system.patch \
> -          "   
> +SRC_URI = " \ 
> +    https://github.com/OpenSCAP/openscap/releases/download/1.4.2/openscap-${PV}.tar.gz \
> [..]
I find the devtool experience is significantly improved using a
repo rather than a tarball.

Using a repo allows for cherry picking (especially useful for
non-master) and use of source control history.
--
Clayton Casciato
Scott Murray Nov. 14, 2025, 8:06 p.m. UTC | #2 
On Fri, 14 Nov 2025, Clayton Casciato wrote:

> On 11/14/25 1:29 AM, Louis Rannou via lists.yoctoproject.org wrote:
> > From: Louis Rannou <louis.rannou@non.se.com>
> >@
> > SRC_URI is based on the github release instead of the SHA for more efficiency.
> > [...]
> > -SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=main;protocol=https \
> > -           file://0001-CMakeLists.txt-fix-installation-directory-for-system.patch \
> > -          "
> > +SRC_URI = " \
> > +    https://github.com/OpenSCAP/openscap/releases/download/1.4.2/openscap-${PV}.tar.gz \
> > [..]
> I find the devtool experience is significantly improved using a
> repo rather than a tarball.
>
> Using a repo allows for cherry picking (especially useful for
> non-master) and use of source control history.

While it's a tar file download would be slightly faster than the git
clone, the recipe has been using a git URI for a long time, and the
devtool comment is fair.  So my plan is to merge Yi and Louis's update
changes, keeping the git URI.

Thanks,

Scott
diff mbox series

Patch

diff --git a/recipes-compliance/openscap/openscap_1.4.1.bb b/recipes-compliance/openscap/openscap_1.4.2.bb
similarity index 87%
rename from recipes-compliance/openscap/openscap_1.4.1.bb
rename to recipes-compliance/openscap/openscap_1.4.2.bb
index 3e5f00a..f7c7aec 100644
--- a/recipes-compliance/openscap/openscap_1.4.1.bb
+++ b/recipes-compliance/openscap/openscap_1.4.2.bb
@@ -1,7 +1,7 @@ 
 # Copyright (C) 2017  - 2023 Armin Kuster  <akuster808@gmail.com>
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-SUMARRY = "NIST Certified SCAP 1.2 toolkit"
+SUMMARY = "NIST Certified SCAP 1.2 toolkit"
 HOME_URL = "https://www.open-scap.org/tools/openscap-base/"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 LICENSE = "LGPL-2.1-only"
@@ -9,11 +9,12 @@  LICENSE = "LGPL-2.1-only"
 DEPENDS = "dbus acl bzip2 pkgconfig gconf procps curl libxml2 libxslt libcap swig libpcre  xmlsec1"
 DEPENDS:class-native = "pkgconfig-native swig-native curl-native libxml2-native libxslt-native libcap-native libpcre-native xmlsec1-native"
 
-SRC_URI = "git://github.com/OpenSCAP/openscap.git;branch=main;protocol=https \
-           file://0001-CMakeLists.txt-fix-installation-directory-for-system.patch \
-          "
+SRC_URI = " \
+    https://github.com/OpenSCAP/openscap/releases/download/1.4.2/openscap-${PV}.tar.gz \
+    file://0001-CMakeLists.txt-fix-installation-directory-for-system.patch \
+"
 
-SRCREV = "23a8ea3de3c4fd6017db4067675a81287177166e"
+SRC_URI[sha512sum] = "126b88d028fafe9c2af882ae7b90ad59a7a429899b45cfa0f4fea188f32b0f9c51615d69a172e9bd4c0a6663aaf40e8fd85c8563575fce00099f3d58d572cbda"
 
 inherit cmake pkgconfig python3native python3targetconfig perlnative systemd
 
@@ -64,5 +65,5 @@  FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
 
 
 RDEPENDS:${PN} = "libxml2 python3-core libgcc bash"
-RDEPENDS:${PN}-class-target = "libxml2 python3-core libgcc bash os-release"
+RDEPENDS:${PN}:class-target = "libxml2 python3-core libgcc bash os-release"
 BBCLASSEXTEND = "native"