summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-security/usbguard
diff options
context:
space:
mode:
authorChristophe Vu-Brugier <christophe.vu-brugier@seagate.com>2024-06-11 20:17:22 +0200
committerKhem Raj <raj.khem@gmail.com>2024-06-11 15:40:17 -0700
commit91274486931089418e59b5f0dcb28f6c472ac881 (patch)
tree683d14cacf19c46ca18ebb2d1d3dcd006f5b4b4a /meta-oe/recipes-security/usbguard
parent45f1bd0933a0766b59d0fc3a1c3150ddcf8ffbf4 (diff)
downloadmeta-openembedded-91274486931089418e59b5f0dcb28f6c472ac881.tar.gz
usbguard: upgrade 1.1.2 -> 1.1.3
Drop patch 0001-include-missing-cstdint.patch because it was merged upstream. See this commit in usbguard: * 22b1e08 Fix build for GCC 13 + make GitHub Actions cover build with GCC 13 (#586) Signed-off-by: Christophe Vu-Brugier <christophe.vu-brugier@seagate.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-security/usbguard')
-rw-r--r--meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch45
-rw-r--r--meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb (renamed from meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb)3
2 files changed, 1 insertions, 47 deletions
diff --git a/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch b/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch
deleted file mode 100644
index 5cbe64091..000000000
--- a/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 1da0cfbb9ae978822d961d8b22d8d5125c11247a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 26 Jan 2023 23:46:56 -0800
4Subject: [PATCH] include missing <cstdint>
5
6gcc 13 moved some includes around and as a result <cstdint> is no
7longer transitively included [1]. Explicitly include it for
8uint8_t.
9
10[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
11
12Upstream-Status: Submitted [https://github.com/USBGuard/usbguard/pull/583]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 src/Library/Base64.cpp | 1 -
16 src/Library/Base64.hpp | 1 +
17 2 files changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/Library/Base64.cpp b/src/Library/Base64.cpp
20index ddb28dc..0246a13 100644
21--- a/src/Library/Base64.cpp
22+++ b/src/Library/Base64.cpp
23@@ -22,7 +22,6 @@
24
25 #include "Base64.hpp"
26 #include <stdexcept>
27-#include <cstdint>
28
29 namespace usbguard
30 {
31diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp
32index 0947f21..e0c745c 100644
33--- a/src/Library/Base64.hpp
34+++ b/src/Library/Base64.hpp
35@@ -23,6 +23,7 @@
36 #endif
37
38 #include <string>
39+#include <cstdint>
40 #include <cstddef>
41
42 namespace usbguard
43--
442.39.1
45
diff --git a/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb
index c062f2705..752938057 100644
--- a/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb
+++ b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb
@@ -12,10 +12,9 @@ LICENSE = "GPL-2.0-only"
12LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" 12LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
13 13
14SRC_URI = "https://github.com/USBGuard/usbguard/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ 14SRC_URI = "https://github.com/USBGuard/usbguard/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
15 file://0001-include-missing-cstdint.patch \
16 file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch" 15 file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch"
17 16
18SRC_URI[sha256sum] = "dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934" 17SRC_URI[sha256sum] = "707dad2938923202697f636c2b4e0be80f192242039a2af3fc7ac35d03f78551"
19 18
20inherit autotools-brokensep bash-completion pkgconfig systemd github-releases 19inherit autotools-brokensep bash-completion pkgconfig systemd github-releases
21 20