[oe] [meta-networking][dunfell][PATCH] proftpd: Fix CVE-2023-51713 Out-of-bounds buffer read
Upstream-Status: Backport from
https://github.com/proftpd/proftpd/commit/97bbe68363ccf2de0c07f67170ec64a8b4d62592
Signed-off-by: Hitendra Prajapati
---
.../proftpd/files/CVE-2023-51713.patch| 277 ++
.../recipes-daemons/proftpd/proftpd_1.3.7c.bb | 1 +
2 files changed, 278 insertions(+)
create mode 100644
meta-networking/recipes-daemons/proftpd/files/CVE-2023-51713.patch
diff --git a/meta-networking/recipes-daemons/proftpd/files/CVE-2023-51713.patch
b/meta-networking/recipes-daemons/proftpd/files/CVE-2023-51713.patch
new file mode 100644
index 00..4b2cac1870
--- /dev/null
+++ b/meta-networking/recipes-daemons/proftpd/files/CVE-2023-51713.patch
@@ -0,0 +1,277 @@
+From 97bbe68363ccf2de0c07f67170ec64a8b4d62592 Mon Sep 17 00:00:00 2001
+From: TJ Saunders
+Date: Sun, 6 Aug 2023 13:16:26 -0700
+Subject: [PATCH] Issue #1683: Avoid an edge case when handling unexpectedly
+ formatted input text from client, caused by quote/backslash semantics, by
+ skipping those semantics.
+
+Upstream-Status: Backport
[https://github.com/proftpd/proftpd/commit/97bbe68363ccf2de0c07f67170ec64a8b4d62592]
+CVE: CVE-2023-51713
+Signed-off-by: Hitendra Prajapati
+---
+ include/str.h | 3 ++-
+ src/main.c | 34 +
+ src/str.c | 22 +-
+ tests/api/str.c | 50 -
+ 4 files changed, 94 insertions(+), 15 deletions(-)
+
+diff --git a/include/str.h b/include/str.h
+index f08398017..1261ae2c2 100644
+--- a/include/str.h
b/include/str.h
+@@ -1,6 +1,6 @@
+ /*
+ * ProFTPD - FTP server daemon
+- * Copyright (c) 2008-2020 The ProFTPD Project team
++ * Copyright (c) 2008-2023 The ProFTPD Project team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -131,6 +131,7 @@ const char *pr_gid2str(pool *, gid_t);
+ #define PR_STR_FL_PRESERVE_COMMENTS 0x0001
+ #define PR_STR_FL_PRESERVE_WHITESPACE 0x0002
+ #define PR_STR_FL_IGNORE_CASE 0x0004
++#define PR_STR_FL_IGNORE_QUOTES 0x0008
+
+ char *pr_str_get_token(char **, char *);
+ char *pr_str_get_token2(char **, char *, size_t *);
+diff --git a/src/main.c b/src/main.c
+index ee9c1eecb..e6b70731d 100644
+--- a/src/main.c
b/src/main.c
+@@ -811,8 +811,24 @@ static cmd_rec *make_ftp_cmd(pool *p, char *buf, size_t
buflen, int flags) {
+ return NULL;
+ }
+
++ /* By default, pr_str_get_word will handle quotes and backslashes for
++ * escaping characters. This can produce words which are shorter, use
++ * fewer bytes than the corresponding input buffer.
++ *
++ * In this particular situation, we use the length of this initial word
++ * for determining the length of the remaining buffer bytes, assumed to
++ * contain the FTP command arguments. If this initial word is thus
++ * unexpectedly "shorter", due to nonconformant FTP text, it can lead
++ * the subsequent buffer scan, looking for CRNUL sequencees, to access
++ * unexpected memory addresses (Issue #1683).
++ *
++ * Thus for this particular situation, we tell the function to ignore/skip
++ * such quote/backslash semantics, and treat them as any other character
++ * using the IGNORE_QUOTES flag.
++ */
++
+ ptr = buf;
+- wrd = pr_str_get_word(, str_flags);
++ wrd = pr_str_get_word(, str_flags|PR_STR_FL_IGNORE_QUOTES);
+ if (wrd == NULL) {
+ /* Nothing there...bail out. */
+ pr_trace_msg("ctrl", 5, "command '%s' is empty, ignoring", buf);
+@@ -820,6 +836,11 @@ static cmd_rec *make_ftp_cmd(pool *p, char *buf, size_t
buflen, int flags) {
+ return NULL;
+ }
+
++ /* Note that this first word is the FTP command. This is why we make
++ * use of the ptr buffer, which advances through the input buffer as
++ * we read words from the buffer.
++ */
++
+ subpool = make_sub_pool(p);
+ pr_pool_tag(subpool, "make_ftp_cmd pool");
+ cmd = pcalloc(subpool, sizeof(cmd_rec));
+@@ -846,6 +867,7 @@ static cmd_rec *make_ftp_cmd(pool *p, char *buf, size_t
buflen, int flags) {
+ arg_len = buflen - strlen(wrd);
+ arg = pcalloc(cmd->pool, arg_len + 1);
+
++ /* Remember that ptr here is advanced past the first word. */
+ for (i = 0, j = 0; i < arg_len; i++) {
+ pr_signals_handle();
+ if (i > 1 &&
+@@ -854,14 +876,13 @@ static cmd_rec *make_ftp_cmd(pool *p, char *buf, size_t
buflen, int flags) {
+
+ /* Strip out the NUL by simply not copying it into the new buffer. */
+ have_crnul = TRUE;
++
+ } else {
+ arg[j++] = ptr[i];
+ }
+ }
+
+- cmd->arg = arg;
+-
+- if (have_crnul) {
++ if (have_crnul == TRUE) {
+ char *dup_arg;
+
+ /* Now make a copy of the stripped argument; this is what we need to
+@@ -871,6 +892,11 @@ static cmd_rec *make_ftp_cmd(pool *p, char *buf, size_t
buflen, int flags) {
+ ptr = dup_arg;
+ }
+
++ cmd->arg = arg;
++
Re: [oe] [meta-oe][PATCH] srecord: fix install prefix
On Tue, Jan 2, 2024 at 4:49 PM Khem Raj wrote: > It will be good to add the tag to point to location of upstream > submitted location > > Upstream-Status: Submitted [url detailing where the submission activity is] > Sorry, I should have anticipated this. Still learning the submission process ropes. Thank you, and stand by for an updated patch. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#108021): https://lists.openembedded.org/g/openembedded-devel/message/108021 Mute This Topic: https://lists.openembedded.org/mt/103487925/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] srecord: fix install prefix
srecord's CMakeLists.txt was unconditionally setting CMAKE_INSTALL_PREFIX
for non-WIN32 builds, which caused it to ignore OE-supplied prefix
that contained the sysroot portion of the path. Fixed by setting
the prefix only if it wasn't explicitly provided.
Signed-off-by: Ilya A. Kriveshko
---
...make-respect-explicit-install-prefix.patch | 31 +++
.../recipes-support/srecord/srecord_1.65.0.bb | 3 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
diff --git
a/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
new file mode 100644
index 0..5a74323bc
--- /dev/null
+++
b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
@@ -0,0 +1,31 @@
+From 4aa8cf8c93e1fa6ffeb40fc3473f32b1b83af141 Mon Sep 17 00:00:00 2001
+From: "Ilya A. Kriveshko"
+Date: Tue, 2 Jan 2024 15:37:10 -0500
+Subject: [PATCH] cmake: respect explicit install prefix
+
+If CMAKE_INSTALL_PREFIX was supplied externally, use it. This follows
+the pattern suggested by cmake documentation in:
+https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html
+
+Upstream-status: Submitted [https://github.com/sierrafoxtrot/srecord/pull/68]
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74b8108c..ac9f464e 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -30,9 +30,9 @@ include(InstallRequiredSystemLibraries)
+ include(GNUInstallDirs)
+
+ # FHS compliant paths for Linux installation
+-if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+-# set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+- set(CMAKE_INSTALL_PREFIX "/usr")
++if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
++AND NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
++ set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE)
+ endif()
+
+ # Pull in the rest of the pieces
diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
index 06ce48e65..3e8a87d07 100644
--- a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
+++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
@@ -4,11 +4,12 @@ LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = " \
https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}',
2)}/${BP}-Source.tar.gz \
file://0001-Disable-doxygen.patch \
-file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch"
+file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \
+file://0001-cmake-respect-explicit-install-prefix.patch"
SRC_URI[sha256sum] =
"81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644"
S = "${WORKDIR}/${BP}-Source"
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases;
--
2.39.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108022):
https://lists.openembedded.org/g/openembedded-devel/message/108022
Mute This Topic: https://lists.openembedded.org/mt/103487925/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] srecord: fix install prefix
On Tue, Jan 2, 2024 at 1:06 PM Ilya A. Kriveshko wrote:
>
> srecord's CMakeLists.txt was unconditionally setting CMAKE_INSTALL_PREFIX
> for non-WIN32 builds, which caused it to ignore OE-supplied prefix
> that contained the sysroot portion of the path. Fixed by setting
> the prefix only if it wasn't explicitly provided.
>
> Signed-off-by: Ilya A. Kriveshko
> ---
> ...make-respect-explicit-install-prefix.patch | 31 +++
> .../recipes-support/srecord/srecord_1.65.0.bb | 3 +-
> 2 files changed, 33 insertions(+), 1 deletion(-)
> create mode 100644
> meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
>
> diff --git
> a/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
>
> b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
> new file mode 100644
> index 0..d310d0410
> --- /dev/null
> +++
> b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
> @@ -0,0 +1,31 @@
> +From 4aa8cf8c93e1fa6ffeb40fc3473f32b1b83af141 Mon Sep 17 00:00:00 2001
> +From: "Ilya A. Kriveshko"
> +Date: Tue, 2 Jan 2024 15:37:10 -0500
> +Subject: [PATCH] cmake: respect explicit install prefix
> +
> +If CMAKE_INSTALL_PREFIX was supplied externally, use it. This follows
> +the pattern suggested by cmake documentation in:
> +https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html
> +
> +Upstream-status: Submitted
It will be good to add the tag to point to location of upstream
submitted location
Upstream-Status: Submitted [url detailing where the submission activity is]
> +---
> + CMakeLists.txt | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 74b8108c..ac9f464e 100644
> +--- a/CMakeLists.txt
> b/CMakeLists.txt
> +@@ -30,9 +30,9 @@ include(InstallRequiredSystemLibraries)
> + include(GNUInstallDirs)
> +
> + # FHS compliant paths for Linux installation
> +-if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
> +-# set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
> +- set(CMAKE_INSTALL_PREFIX "/usr")
> ++if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
> ++AND NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL
> CMAKE_CURRENT_SOURCE_DIR)
> ++ set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE)
> + endif()
> +
> + # Pull in the rest of the pieces
> diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
> b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
> index 06ce48e65..3e8a87d07 100644
> --- a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
> +++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
> @@ -4,11 +4,12 @@ LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
>
> SRC_URI = " \
>
> https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}',
> 2)}/${BP}-Source.tar.gz \
> file://0001-Disable-doxygen.patch \
> -file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch"
> +file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \
> +file://0001-cmake-respect-explicit-install-prefix.patch"
> SRC_URI[sha256sum] =
> "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644"
> S = "${WORKDIR}/${BP}-Source"
>
> UPSTREAM_CHECK_URI =
> "https://sourceforge.net/projects/srecord/files/releases;
>
> --
> 2.39.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108020):
https://lists.openembedded.org/g/openembedded-devel/message/108020
Mute This Topic: https://lists.openembedded.org/mt/103487925/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] srecord: fix install prefix
srecord's CMakeLists.txt was unconditionally setting CMAKE_INSTALL_PREFIX
for non-WIN32 builds, which caused it to ignore OE-supplied prefix
that contained the sysroot portion of the path. Fixed by setting
the prefix only if it wasn't explicitly provided.
Signed-off-by: Ilya A. Kriveshko
---
...make-respect-explicit-install-prefix.patch | 31 +++
.../recipes-support/srecord/srecord_1.65.0.bb | 3 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
diff --git
a/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
new file mode 100644
index 0..d310d0410
--- /dev/null
+++
b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch
@@ -0,0 +1,31 @@
+From 4aa8cf8c93e1fa6ffeb40fc3473f32b1b83af141 Mon Sep 17 00:00:00 2001
+From: "Ilya A. Kriveshko"
+Date: Tue, 2 Jan 2024 15:37:10 -0500
+Subject: [PATCH] cmake: respect explicit install prefix
+
+If CMAKE_INSTALL_PREFIX was supplied externally, use it. This follows
+the pattern suggested by cmake documentation in:
+https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html
+
+Upstream-status: Submitted
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74b8108c..ac9f464e 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -30,9 +30,9 @@ include(InstallRequiredSystemLibraries)
+ include(GNUInstallDirs)
+
+ # FHS compliant paths for Linux installation
+-if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+-# set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+- set(CMAKE_INSTALL_PREFIX "/usr")
++if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
++AND NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
++ set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE)
+ endif()
+
+ # Pull in the rest of the pieces
diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
index 06ce48e65..3e8a87d07 100644
--- a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
+++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
@@ -4,11 +4,12 @@ LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = " \
https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}',
2)}/${BP}-Source.tar.gz \
file://0001-Disable-doxygen.patch \
-file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch"
+file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \
+file://0001-cmake-respect-explicit-install-prefix.patch"
SRC_URI[sha256sum] =
"81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644"
S = "${WORKDIR}/${BP}-Source"
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases;
--
2.39.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108019):
https://lists.openembedded.org/g/openembedded-devel/message/108019
Mute This Topic: https://lists.openembedded.org/mt/103487925/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] Yocto Project Newcomer & Unassigned Bugs - Help Needed
All, The triage team is starting to try and collect up and classify bugs which a newcomer to the project would be able to work on in a way which means people can find them. They're being listed on the triage page under the appropriate heading: https://wiki.yoctoproject.org/wiki/Bug_Triage#Newcomer_Bugs Also please review: https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded and how to create a bugzilla account at: https://bugzilla.yoctoproject.org/createaccount.cgi The idea is these bugs should be straight forward for a person to help work on who doesn't have deep experience with the project. If anyone can help, please take ownership of the bug and send patches! If anyone needs help/advice there are people on irc who can likely do so, or some of the more experienced contributors will likely be happy to help too. Also, the triage team meets weekly and does its best to handle the bugs reported into the Bugzilla. The number of people attending that meeting has fallen, as have the number of people available to help fix bugs. One of the things we hear users report is they don't know how to help. We (the triage team) are therefore going to start reporting out the currently 408 unassigned or newcomer bugs. We're hoping people may be able to spare some time now and again to help out with these. Bugs are split into two types, "true bugs" where things don't work as they should and "enhancements" which are features we'd want to add to the system. There are also roughly four different "priority" classes right now, “5.0”, “5.1”, "5.99" and "Future", the more pressing/urgent issues being in "5.0" and then “5.1”. Please review this link and if a bug is something you would be able to help with either take ownership of the bug, or send me (sjolley.yp...@gmail.com) an e-mail with the bug number you would like and I will assign it to you (please make sure you have a Bugzilla account). The list is at: https://wiki.yoctoproject.org/wiki/Bug_Triage_Archive#Unassigned_or_Newcomer_Bugs Thanks, *Stephen K. Jolley* *Yocto Project Program Manager* (*Cell*:(208) 244-4460 * *Email*: *s jolley.yp...@gmail.com * -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#108018): https://lists.openembedded.org/g/openembedded-devel/message/108018 Mute This Topic: https://lists.openembedded.org/mt/103489967/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] srecord: fix install prefix
On Tue, Jan 2, 2024 at 2:29 PM Khem Raj wrote: > I think if we can change the logic to check for CMAKE_INSTALL_PREFIX > before setting it to /usr here > could work here as well as become worth upstreaming too. > OK, thanks for the suggestion. I previously struggled to write that check, since cmake defines CMAKE_INSTALL_PREFIX by default. However, with your prodding, I found: https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html I will re-create the patch with this, and make an upstream submission. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#108017): https://lists.openembedded.org/g/openembedded-devel/message/108017 Mute This Topic: https://lists.openembedded.org/mt/103487925/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH] srecord: fix install prefix
On Tue, Jan 2, 2024 at 11:12 AM Ilya A. Kriveshko wrote:
>
> srecord's CMakeLists.txt was unconditionally setting CMAKE_INSTALL_PREFIX
> for non-WIN32 builds, which caused it to ignore OE-supplied prefix
> that contained the sysroot portion of the path. Fixed by removing the
> offending line.
>
> Signed-off-by: Ilya A. Kriveshko
> ---
> ...rnally-supplied-CMAKE_INSTALL_PREFIX.patch | 27 +++
> .../recipes-support/srecord/srecord_1.65.0.bb | 3 ++-
> 2 files changed, 29 insertions(+), 1 deletion(-)
> create mode 100644
> meta-oe/recipes-support/srecord/files/0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch
>
> diff --git
> a/meta-oe/recipes-support/srecord/files/0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch
>
> b/meta-oe/recipes-support/srecord/files/0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch
> new file mode 100644
> index 0..19b5c88f6
> --- /dev/null
> +++
> b/meta-oe/recipes-support/srecord/files/0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch
> @@ -0,0 +1,27 @@
> +From 023b3de19a9c04858f34143d5d9b32bd0287f6d7 Mon Sep 17 00:00:00 2001
> +From: "Ilya A. Kriveshko"
> +Date: Fri, 29 Dec 2023 20:48:37 +
> +Subject: [PATCH] Allow externally supplied CMAKE_INSTALL_PREFIX
> +
> +CMAKE_INSTALL_PREFIX variable is supposed to be left as a default,
> +or overwritten by the packager. In particular, OE-provided prefix
> +includes the sysroots path and should be used.
> +
I think if we can change the logic to check for CMAKE_INSTALL_PREFIX
before setting it to /usr here
could work here as well as become worth upstreaming too.
> +Upstream-Status: Inappropriate [OE-specific]
> +
> +---
> + CMakeLists.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 74b8108..f149917 100644
> +--- a/CMakeLists.txt
> b/CMakeLists.txt
> +@@ -32,7 +32,6 @@ include(GNUInstallDirs)
> + # FHS compliant paths for Linux installation
> + if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
> + # set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
> +- set(CMAKE_INSTALL_PREFIX "/usr")
> + endif()
> +
> + # Pull in the rest of the pieces
> diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
> b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
> index 06ce48e65..6887f629e 100644
> --- a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
> +++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
> @@ -4,11 +4,12 @@ LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
>
> SRC_URI = " \
>
> https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}',
> 2)}/${BP}-Source.tar.gz \
> file://0001-Disable-doxygen.patch \
> -file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch"
> +file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \
> +file://0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch"
> SRC_URI[sha256sum] =
> "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644"
> S = "${WORKDIR}/${BP}-Source"
>
> UPSTREAM_CHECK_URI =
> "https://sourceforge.net/projects/srecord/files/releases;
>
> --
> 2.39.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108016):
https://lists.openembedded.org/g/openembedded-devel/message/108016
Mute This Topic: https://lists.openembedded.org/mt/103487925/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] srecord: fix install prefix
srecord's CMakeLists.txt was unconditionally setting CMAKE_INSTALL_PREFIX
for non-WIN32 builds, which caused it to ignore OE-supplied prefix
that contained the sysroot portion of the path. Fixed by removing the
offending line.
Signed-off-by: Ilya A. Kriveshko
---
...rnally-supplied-CMAKE_INSTALL_PREFIX.patch | 27 +++
.../recipes-support/srecord/srecord_1.65.0.bb | 3 ++-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-support/srecord/files/0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch
diff --git
a/meta-oe/recipes-support/srecord/files/0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch
b/meta-oe/recipes-support/srecord/files/0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch
new file mode 100644
index 0..19b5c88f6
--- /dev/null
+++
b/meta-oe/recipes-support/srecord/files/0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch
@@ -0,0 +1,27 @@
+From 023b3de19a9c04858f34143d5d9b32bd0287f6d7 Mon Sep 17 00:00:00 2001
+From: "Ilya A. Kriveshko"
+Date: Fri, 29 Dec 2023 20:48:37 +
+Subject: [PATCH] Allow externally supplied CMAKE_INSTALL_PREFIX
+
+CMAKE_INSTALL_PREFIX variable is supposed to be left as a default,
+or overwritten by the packager. In particular, OE-provided prefix
+includes the sysroots path and should be used.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74b8108..f149917 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -32,7 +32,6 @@ include(GNUInstallDirs)
+ # FHS compliant paths for Linux installation
+ if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+ # set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+- set(CMAKE_INSTALL_PREFIX "/usr")
+ endif()
+
+ # Pull in the rest of the pieces
diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
index 06ce48e65..6887f629e 100644
--- a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
+++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
@@ -4,11 +4,12 @@ LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = " \
https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}',
2)}/${BP}-Source.tar.gz \
file://0001-Disable-doxygen.patch \
-file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch"
+file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \
+file://0001-allow-externally-supplied-CMAKE_INSTALL_PREFIX.patch"
SRC_URI[sha256sum] =
"81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644"
S = "${WORKDIR}/${BP}-Source"
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases;
--
2.39.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108015):
https://lists.openembedded.org/g/openembedded-devel/message/108015
Mute This Topic: https://lists.openembedded.org/mt/103487925/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCHv3] ssd1306_git.bb: Add ssd1306_linux
Add ssd1306_linux, a simple OLED I2C SSD1306 Linux driver based on
the i2c library libi2c from i2c-tools. Example usage for a
compatible display with resolution 128x64 pixels:
ssd1306_bin -n 1 -I 128x64
ssd1306_bin -n 1 -c
ssd1306_bin -n 1 -r 0
ssd1306_bin -n 1 -x 1 -y 1
ssd1306_bin -n 1 -l "Hello World"
Pending GitHub pull request to the upstream of the project:
https://github.com/armlabs/ssd1306_linux/pull/4
After fixing the upstream 0001-Use-include-filename.patch should
be removed from the recipe.
Signed-off-by: Leon Anavi
---
.../ssd1306/0001-Use-include-filename.patch | 49 +++
.../recipes-devtools/ssd1306/ssd1306_git.bb | 25 ++
2 files changed, 74 insertions(+)
create mode 100644
meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
create mode 100644 meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
diff --git
a/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
b/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
new file mode 100644
index 0..dfe48175a
--- /dev/null
+++ b/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
@@ -0,0 +1,49 @@
+From cb32ebbb1efb3202808809861ec3cbd811c55bd2 Mon Sep 17 00:00:00 2001
+From: Leon Anavi
+Date: Sat, 30 Dec 2023 13:23:31 +
+Subject: [PATCH] Use include "filename"
+
+Use include "filename" to include programmer-defined header files
+from the same directory as the file containing the directive.
+
+Upstream-Status: Submitted [https://github.com/armlabs/ssd1306_linux/pull/4]
+
+Signed-off-by: Leon Anavi
+---
+ main.c| 2 +-
+ ssd1306.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/main.c b/main.c
+index c1ffc2f..18e2b84 100644
+--- a/main.c
b/main.c
+@@ -6,7 +6,7 @@
+ #include
+ #include
+ #include
+-#include
++#include "ssd1306.h"
+
+ void print_help()
+ {
+diff --git a/ssd1306.c b/ssd1306.c
+index a03674a..2e6ba97 100644
+--- a/ssd1306.c
b/ssd1306.c
+@@ -8,9 +8,9 @@
+ #include
+ #include
+ #include
+-#include
+-#include
+-#include
++#include "linux_i2c.h"
++#include "ssd1306.h"
++#include "font.h"
+
+ const char init_oled_type_file[] = "/tmp/.ssd1306_oled_type";
+
+--
+2.39.2
+
diff --git a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
new file mode 100644
index 0..5adfd3ed6
--- /dev/null
+++ b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
@@ -0,0 +1,25 @@
+SUMMARY="SSD1306 OLED I2C drive"
+DESCRIPTION = "SSD1306 OLED I2C driver working in Linux"
+HOMEPAGE = "https://github.com/armlabs/ssd1306_linux;
+SECTION = "console/utils"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7b694e603a996c3bfdc6093ed1f70c8f"
+
+SRC_URI = " \
+git://github.com/armlabs/ssd1306_linux.git;protocol=https;branch=master \
+file://0001-Use-include-filename.patch \
+"
+SRCREV = "7375f1088732d243f7167c9a17725f1a860da587"
+
+S = "${WORKDIR}/git"
+
+# coreutils provides fmt which is used in the Makefile
+DEPENDS = "i2c-tools coreutils-native"
+
+EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
+
+do_install() {
+install -d ${D}${bindir}
+install -m 0755 ${B}/ssd1306_bin ${D}${bindir}
+}
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108014):
https://lists.openembedded.org/g/openembedded-devel/message/108014
Mute This Topic: https://lists.openembedded.org/mt/103487593/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCHv2] ssd1306_git.bb: Add ssd1306_linux
On Tue, Jan 2, 2024 at 3:04 AM Leon Anavi wrote:
>
> Add ssd1306_linux, a simple OLED I2C SSD1306 Linux driver based on
> the i2c library libi2c from i2c-tools. Example usage for a
> compatible display with resolution 128x64 pixels:
>
> ssd1306_bin -n 1 -I 128x64
> ssd1306_bin -n 1 -c
> ssd1306_bin -n 1 -r 0
> ssd1306_bin -n 1 -x 1 -y 1
> ssd1306_bin -n 1 -l "Hello World"
>
> Pending GitHub pull request to the upstream of the project:
> https://github.com/armlabs/ssd1306_linux/pull/4
>
> After fixing the upstream 0001-Use-include-filename.patch should
> be removed from the recipe.
>
> Signed-off-by: Leon Anavi
> ---
> .../ssd1306/0001-Use-include-filename.patch | 52 +++
> .../recipes-devtools/ssd1306/ssd1306_git.bb | 25 +
> 2 files changed, 77 insertions(+)
> create mode 100644
> meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
> create mode 100644 meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
>
> diff --git
> a/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
> b/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
> new file mode 100644
> index 0..a43116084
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
> @@ -0,0 +1,52 @@
> +From cb32ebbb1efb3202808809861ec3cbd811c55bd2 Mon Sep 17 00:00:00 2001
> +From: Leon Anavi
> +Date: Sat, 30 Dec 2023 13:23:31 +
> +Subject: [PATCH] Use include "filename"
> +
> +Use include "filename" to include programmer-defined header files
> +from the same directory as the file containing the directive.
> +
> +GitHub pull request to the upstream of the project:
> +https://github.com/armlabs/ssd1306_linux/pull/4
> +
This info above could be merged into line below e.g.
Upstream-Status: Submitted [https://github.com/armlabs/ssd1306_linux/pull/4]
> +Upstream-Status: Pending
> +
> +Signed-off-by: Leon Anavi
> +---
> + main.c| 2 +-
> + ssd1306.c | 6 +++---
> + 2 files changed, 4 insertions(+), 4 deletions(-)
> +
> +diff --git a/main.c b/main.c
> +index c1ffc2f..18e2b84 100644
> +--- a/main.c
> b/main.c
> +@@ -6,7 +6,7 @@
> + #include
> + #include
> + #include
> +-#include
> ++#include "ssd1306.h"
> +
> + void print_help()
> + {
> +diff --git a/ssd1306.c b/ssd1306.c
> +index a03674a..2e6ba97 100644
> +--- a/ssd1306.c
> b/ssd1306.c
> +@@ -8,9 +8,9 @@
> + #include
> + #include
> + #include
> +-#include
> +-#include
> +-#include
> ++#include "linux_i2c.h"
> ++#include "ssd1306.h"
> ++#include "font.h"
> +
> + const char init_oled_type_file[] = "/tmp/.ssd1306_oled_type";
> +
> +--
> +2.39.2
> +
> diff --git a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
> b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
> new file mode 100644
> index 0..5adfd3ed6
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
> @@ -0,0 +1,25 @@
> +SUMMARY="SSD1306 OLED I2C drive"
> +DESCRIPTION = "SSD1306 OLED I2C driver working in Linux"
> +HOMEPAGE = "https://github.com/armlabs/ssd1306_linux;
> +SECTION = "console/utils"
> +LICENSE = "MIT"
> +
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b694e603a996c3bfdc6093ed1f70c8f"
> +
> +SRC_URI = " \
> +git://github.com/armlabs/ssd1306_linux.git;protocol=https;branch=master \
> +file://0001-Use-include-filename.patch \
> +"
> +SRCREV = "7375f1088732d243f7167c9a17725f1a860da587"
> +
> +S = "${WORKDIR}/git"
> +
> +# coreutils provides fmt which is used in the Makefile
> +DEPENDS = "i2c-tools coreutils-native"
> +
> +EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
> +
> +do_install() {
> +install -d ${D}${bindir}
> +install -m 0755 ${B}/ssd1306_bin ${D}${bindir}
> +}
> --
> 2.39.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108011):
https://lists.openembedded.org/g/openembedded-devel/message/108011
Mute This Topic: https://lists.openembedded.org/mt/103479288/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][kirkstone][PATCH 1/1] apache2: upgrade 2.4.57 -> 2.4.58
On 04-12-2023 21:18, Narpat Mali via lists.openembedded.org wrote:
From: Narpat Mali
This upgrade incorporates the CVE-2023-31122, CVE-2023-43622 &
CVE-2023-45802 fixes and other bugfixes.
The "0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch"
is no longer needed as it's included in this upgrade.
Changelog:
https://downloads.apache.org/httpd/CHANGES_2.4.58
References:
https://httpd.apache.org/security/vulnerabilities_24.html
https://security-tracker.debian.org/tracker/CVE-2023-31122
https://security-tracker.debian.org/tracker/CVE-2023-43622
https://security-tracker.debian.org/tracker/CVE-2023-45802
Signed-off-by: Narpat Mali
---
...config9.m4-Add-server-directory-to-i.patch | 31 ---
.../{apache2_2.4.57.bb => apache2_2.4.58.bb} | 3 +-
2 files changed, 1 insertion(+), 33 deletions(-)
delete mode 100644
meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.57.bb =>
apache2_2.4.58.bb} (98%)
diff --git
a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
deleted file mode 100644
index 996eabf586..00
---
a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001
-From: Valeria Petrov
-Date: Tue, 18 Apr 2023 15:38:53 +0200
-Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to
- include path if mod_rewrite is enabled.
-
-Upstream-Status: Accepted
[https://svn.apache.org/viewvc?view=revision=1909241]
-
- modules/mappers/config9.m4 | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
-index 55a97ab993..7120b729b7 100644
a/modules/mappers/config9.m4
-+++ b/modules/mappers/config9.m4
-@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to user-specific
directories, , , mos
- APACHE_MODULE(alias, mapping of requests to different filesystem parts, , ,
yes)
- APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
-
-+if test "x$enable_rewrite" != "xno"; then
-+# mod_rewrite needs test_char.h
-+APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server])
-+fi
-+
- APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
-
- APACHE_MODPATH_FINISH
---
-2.25.1
-
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb
similarity index 98%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb
index 00f8aaa415..f7376fc58a 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb
@@ -16,7 +16,6 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
file://0008-Fix-perl-install-directory-to-usr-bin.patch \
file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch
\
file://0001-make_exports.awk-not-expose-the-path.patch \
-
file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch \
"
SRC_URI:append:class-target = " \
@@ -28,7 +27,7 @@ SRC_URI:append:class-target = " \
"
LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
-SRC_URI[sha256sum] =
"dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
+SRC_URI[sha256sum] =
"fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5"
S = "${WORKDIR}/httpd-${PV}"
Gentle Reminder !!
../Narpat
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108010):
https://lists.openembedded.org/g/openembedded-devel/message/108010
Mute This Topic: https://lists.openembedded.org/mt/102972765/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] i2cdev_git: Remove AUTHOR field
The AUTHOR field is no longer used in generating packages. It may also create a possible confusion with the recipe maintainer name, so let's remove it. Signed-off-by: Fabio Estevam --- meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb b/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb index b1f8a7f80575..b41ecffae430 100644 --- a/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb +++ b/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb @@ -3,7 +3,6 @@ DESCRIPTION = "\ This package contains an I2C dev library and the i2c bus scanning \ utility lsi2c. \ " -AUTHOR = "Danielle Costantino" HOMEPAGE = "https://github.com/costad2/i2cdev; LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "\ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#108009): https://lists.openembedded.org/g/openembedded-devel/message/108009 Mute This Topic: https://lists.openembedded.org/mt/103481124/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] libpaper: upgrade 2.1.0 -> 2.1.2
Changelog:
2.1.2
* This release contains a change only to the tests, which improves the
detection of glibc.
2.1.1
* Fixes the -N flag of paperconf.
Signed-off-by: alperak
---
.../libpaper/{libpaper_2.1.0.bb => libpaper_2.1.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/libpaper/{libpaper_2.1.0.bb =>
libpaper_2.1.2.bb} (74%)
diff --git a/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb
b/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb
similarity index 74%
rename from meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb
rename to meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb
index 911582553..a45ffe184 100644
--- a/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb
+++ b/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb
@@ -2,7 +2,7 @@ LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI =
"https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz;
-SRC_URI[sha256sum] =
"474e9575e1235a0d8e3661f072de0193bab6ea1023363772f698a2cc39d640cf"
+SRC_URI[sha256sum] =
"1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f"
inherit perlnative autotools
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108008):
https://lists.openembedded.org/g/openembedded-devel/message/108008
Mute This Topic: https://lists.openembedded.org/mt/103480128/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCHv2] ssd1306_git.bb: Add ssd1306_linux
Add ssd1306_linux, a simple OLED I2C SSD1306 Linux driver based on
the i2c library libi2c from i2c-tools. Example usage for a
compatible display with resolution 128x64 pixels:
ssd1306_bin -n 1 -I 128x64
ssd1306_bin -n 1 -c
ssd1306_bin -n 1 -r 0
ssd1306_bin -n 1 -x 1 -y 1
ssd1306_bin -n 1 -l "Hello World"
Pending GitHub pull request to the upstream of the project:
https://github.com/armlabs/ssd1306_linux/pull/4
After fixing the upstream 0001-Use-include-filename.patch should
be removed from the recipe.
Signed-off-by: Leon Anavi
---
.../ssd1306/0001-Use-include-filename.patch | 52 +++
.../recipes-devtools/ssd1306/ssd1306_git.bb | 25 +
2 files changed, 77 insertions(+)
create mode 100644
meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
create mode 100644 meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
diff --git
a/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
b/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
new file mode 100644
index 0..a43116084
--- /dev/null
+++ b/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
@@ -0,0 +1,52 @@
+From cb32ebbb1efb3202808809861ec3cbd811c55bd2 Mon Sep 17 00:00:00 2001
+From: Leon Anavi
+Date: Sat, 30 Dec 2023 13:23:31 +
+Subject: [PATCH] Use include "filename"
+
+Use include "filename" to include programmer-defined header files
+from the same directory as the file containing the directive.
+
+GitHub pull request to the upstream of the project:
+https://github.com/armlabs/ssd1306_linux/pull/4
+
+Upstream-Status: Pending
+
+Signed-off-by: Leon Anavi
+---
+ main.c| 2 +-
+ ssd1306.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/main.c b/main.c
+index c1ffc2f..18e2b84 100644
+--- a/main.c
b/main.c
+@@ -6,7 +6,7 @@
+ #include
+ #include
+ #include
+-#include
++#include "ssd1306.h"
+
+ void print_help()
+ {
+diff --git a/ssd1306.c b/ssd1306.c
+index a03674a..2e6ba97 100644
+--- a/ssd1306.c
b/ssd1306.c
+@@ -8,9 +8,9 @@
+ #include
+ #include
+ #include
+-#include
+-#include
+-#include
++#include "linux_i2c.h"
++#include "ssd1306.h"
++#include "font.h"
+
+ const char init_oled_type_file[] = "/tmp/.ssd1306_oled_type";
+
+--
+2.39.2
+
diff --git a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
new file mode 100644
index 0..5adfd3ed6
--- /dev/null
+++ b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
@@ -0,0 +1,25 @@
+SUMMARY="SSD1306 OLED I2C drive"
+DESCRIPTION = "SSD1306 OLED I2C driver working in Linux"
+HOMEPAGE = "https://github.com/armlabs/ssd1306_linux;
+SECTION = "console/utils"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7b694e603a996c3bfdc6093ed1f70c8f"
+
+SRC_URI = " \
+git://github.com/armlabs/ssd1306_linux.git;protocol=https;branch=master \
+file://0001-Use-include-filename.patch \
+"
+SRCREV = "7375f1088732d243f7167c9a17725f1a860da587"
+
+S = "${WORKDIR}/git"
+
+# coreutils provides fmt which is used in the Makefile
+DEPENDS = "i2c-tools coreutils-native"
+
+EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
+
+do_install() {
+install -d ${D}${bindir}
+install -m 0755 ${B}/ssd1306_bin ${D}${bindir}
+}
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108007):
https://lists.openembedded.org/g/openembedded-devel/message/108007
Mute This Topic: https://lists.openembedded.org/mt/103479288/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] v4l-utils: Add PACKAGECONFIG for v4l2-tracer to fix determinstic build
From: Robert Yang
Fixed do_package error when json-c is in the build dependencies chain:
ERROR: QA Issue: -dev package libv4l-dev contains non-symlink .so
'/usr/lib/libv4l2tracer.so' [dev-elf]
This recipe builds out files such as av4l1compat.so v4l2convert.so and
libv4l2tracer.so which are not symlinks.
Signed-off-by: Robert Yang
---
meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb
b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb
index c02645a6b8..f314d9b6ae 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb
@@ -24,6 +24,7 @@ PACKAGECONFIG ??= "media-ctl"
PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,,"
PACKAGECONFIG[qv4l2] = ",--disable-qv4l2"
PACKAGECONFIG[qvidcap] = ",--disable-qvidcap"
+PACKAGECONFIG[v4l2-tracer] = ",--disable-v4l2-tracer,json-c"
SRC_URI = "\
git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \
@@ -77,7 +78,9 @@ FILES:${PN} = "${bindir} ${sbindir}"
FILES:libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so
${libdir}/libv4l/plugins/*.so \
${libdir}/libdvbv5*${SOLIBS} \
- ${libdir}/libv4l/*-decomp"
+ ${libdir}/libv4l/*-decomp \
+ ${libdir}/libv4l2tracer.so \
+"
FILES:libv4l-dev += "${includedir} ${libdir}/pkgconfig \
${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#108006):
https://lists.openembedded.org/g/openembedded-devel/message/108006
Mute This Topic: https://lists.openembedded.org/mt/103478327/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
