diff mbox series

[meta-oe] zlog: upgrade 1.2.16 -> 1.2.18

Message ID 20250923171012.2274702-1-skandigraun@gmail.com
State Under Review
Headers show
Series [meta-oe] zlog: upgrade 1.2.16 -> 1.2.18 | expand

Commit Message

Gyorgy Sarvari Sept. 23, 2025, 5:10 p.m. UTC
Switched to cmake. Added a backported patch to be able to use
the latest version of cmake.

License-Update: License changed to Apache2:
https://github.com/HardySimpson/zlog/commit/1a7b1a6fb956b92a4079ccc91f30da21f34ca063

Changelog:
1.2.18:
- patched severe vulnerability CVE-2024-22857
- restructured build system

1.2.17:
- Change Lience to Apache 2.0, for more people

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 .../files/upgrade_cmake_minimum_version.patch | 25 +++++++++++++++++++
 meta-oe/recipes-extended/zlog/zlog_1.2.16.bb  | 16 ------------
 meta-oe/recipes-extended/zlog/zlog_1.2.18.bb  | 11 ++++++++
 3 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch
 delete mode 100644 meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
 create mode 100644 meta-oe/recipes-extended/zlog/zlog_1.2.18.bb

Comments

Khem Raj Sept. 23, 2025, 9:22 p.m. UTC | #1
fails to pass build QA

https://autobuilder.yoctoproject.org/valkyrie/#/builders/81/builds/947

On Tue, Sep 23, 2025 at 10:10 AM Gyorgy Sarvari via
lists.openembedded.org <skandigraun=gmail.com@lists.openembedded.org>
wrote:
>
> Switched to cmake. Added a backported patch to be able to use
> the latest version of cmake.
>
> License-Update: License changed to Apache2:
> https://github.com/HardySimpson/zlog/commit/1a7b1a6fb956b92a4079ccc91f30da21f34ca063
>
> Changelog:
> 1.2.18:
> - patched severe vulnerability CVE-2024-22857
> - restructured build system
>
> 1.2.17:
> - Change Lience to Apache 2.0, for more people
>
> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
> ---
>  .../files/upgrade_cmake_minimum_version.patch | 25 +++++++++++++++++++
>  meta-oe/recipes-extended/zlog/zlog_1.2.16.bb  | 16 ------------
>  meta-oe/recipes-extended/zlog/zlog_1.2.18.bb  | 11 ++++++++
>  3 files changed, 36 insertions(+), 16 deletions(-)
>  create mode 100644 meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch
>  delete mode 100644 meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
>  create mode 100644 meta-oe/recipes-extended/zlog/zlog_1.2.18.bb
>
> diff --git a/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch b/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch
> new file mode 100644
> index 0000000000..9d02066d57
> --- /dev/null
> +++ b/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch
> @@ -0,0 +1,25 @@
> +From 3715879775f725260aeda14f94887bbc7a007e29 Mon Sep 17 00:00:00 2001
> +From: haydenZhou <mfkhao2009@outlook.com>
> +Date: Sun, 8 Jun 2025 10:45:05 +0800
> +Subject: [PATCH] upgrade cmake minimum version
> +
> +Upstream-Status: Backport [https://github.com/HardySimpson/zlog/commit/3715879775f725260aeda14f94887bbc7a007e29]
> +
> +Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
> +---
> + CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 5ddaf8d..31a1553 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -14,7 +14,7 @@
> + # limitations under the License.
> + #/
> +
> +-cmake_minimum_required(VERSION 2.8.5)
> ++cmake_minimum_required(VERSION 3.12)
> +
> + message(STATUS "path : ${CMAKE_FIND_ROOT_PATH}")
> + project(zlog)
> diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
> deleted file mode 100644
> index f450c2cf01..0000000000
> --- a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -DESCRIPTION = "Zlog is a pure C logging library"
> -HOMEPAGE = "https://github.com/HardySimpson/zlog"
> -LICENSE = "LGPL-2.1-only"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
> -
> -SRCREV = "dc2c284664757fce6ef8f96f8b3ab667a53ef489"
> -SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https"
> -
> -
> -inherit pkgconfig
> -
> -EXTRA_OEMAKE = "CC='${CC}' LD='${LD}' LIBRARY_PATH=${baselib}"
> -
> -do_install() {
> -    oe_runmake install PREFIX=${D}${exec_prefix} INSTALL=install
> -}
> diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.18.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.18.bb
> new file mode 100644
> index 0000000000..48628ca733
> --- /dev/null
> +++ b/meta-oe/recipes-extended/zlog/zlog_1.2.18.bb
> @@ -0,0 +1,11 @@
> +DESCRIPTION = "Zlog is a pure C logging library"
> +HOMEPAGE = "https://github.com/HardySimpson/zlog"
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
> +
> +SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https;tag=${PV} \
> +           file://upgrade_cmake_minimum_version.patch"
> +SRCREV = "7fe61ca6265516e9327a51fc394b2adb126c2ef3"
> +
> +inherit cmake
> +
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#119719): https://lists.openembedded.org/g/openembedded-devel/message/119719
> Mute This Topic: https://lists.openembedded.org/mt/115397698/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch b/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch
new file mode 100644
index 0000000000..9d02066d57
--- /dev/null
+++ b/meta-oe/recipes-extended/zlog/files/upgrade_cmake_minimum_version.patch
@@ -0,0 +1,25 @@ 
+From 3715879775f725260aeda14f94887bbc7a007e29 Mon Sep 17 00:00:00 2001
+From: haydenZhou <mfkhao2009@outlook.com>
+Date: Sun, 8 Jun 2025 10:45:05 +0800
+Subject: [PATCH] upgrade cmake minimum version
+
+Upstream-Status: Backport [https://github.com/HardySimpson/zlog/commit/3715879775f725260aeda14f94887bbc7a007e29]
+
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ddaf8d..31a1553 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@
+ # limitations under the License.
+ #/
+ 
+-cmake_minimum_required(VERSION 2.8.5)
++cmake_minimum_required(VERSION 3.12)
+ 
+ message(STATUS "path : ${CMAKE_FIND_ROOT_PATH}")
+ project(zlog)
diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
deleted file mode 100644
index f450c2cf01..0000000000
--- a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
+++ /dev/null
@@ -1,16 +0,0 @@ 
-DESCRIPTION = "Zlog is a pure C logging library"
-HOMEPAGE = "https://github.com/HardySimpson/zlog"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRCREV = "dc2c284664757fce6ef8f96f8b3ab667a53ef489"
-SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https"
-
-
-inherit pkgconfig
-
-EXTRA_OEMAKE = "CC='${CC}' LD='${LD}' LIBRARY_PATH=${baselib}"
-
-do_install() {
-    oe_runmake install PREFIX=${D}${exec_prefix} INSTALL=install
-}
diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.18.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.18.bb
new file mode 100644
index 0000000000..48628ca733
--- /dev/null
+++ b/meta-oe/recipes-extended/zlog/zlog_1.2.18.bb
@@ -0,0 +1,11 @@ 
+DESCRIPTION = "Zlog is a pure C logging library"
+HOMEPAGE = "https://github.com/HardySimpson/zlog"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https;tag=${PV} \
+           file://upgrade_cmake_minimum_version.patch"
+SRCREV = "7fe61ca6265516e9327a51fc394b2adb126c2ef3"
+
+inherit cmake
+