From aa57a13788b33df008bc58f239abd43b7941b122 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Mon, 15 Aug 2022 07:54:39 -0700 Subject: cyptmount: Fix mount.h conflicts seen with glibc 2.36+ Signed-off-by: Armin Kuster --- recipes-security/cryptmount/cryptmount_5.3.3.bb | 4 +++- .../cryptmount/files/remove_linux_fs.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 recipes-security/cryptmount/files/remove_linux_fs.patch diff --git a/recipes-security/cryptmount/cryptmount_5.3.3.bb b/recipes-security/cryptmount/cryptmount_5.3.3.bb index 6e653c8..fb522cb 100644 --- a/recipes-security/cryptmount/cryptmount_5.3.3.bb +++ b/recipes-security/cryptmount/cryptmount_5.3.3.bb @@ -3,7 +3,9 @@ HOMEPAGE = "http://cryptmount.sourceforge.net/" LIC_FILES_CHKSUM = "file://README;beginline=3;endline=4;md5=673a990de93a2c5531a0f13f1c40725a" LICENSE = "GPL-2.0-only" -SRC_URI = "https://sourceforge.net/projects/cryptmount/files/${BPN}/${BPN}-5.3/${BPN}-${PV}.tar.gz" +SRC_URI = "https://sourceforge.net/projects/cryptmount/files/${BPN}/${BPN}-5.3/${BPN}-${PV}.tar.gz \ + file://remove_linux_fs.patch \ + " SRC_URI[sha256sum] = "682953ff5ba497d48d6b13e22ca726c98659abd781bb8596bb299640dd255d9b" diff --git a/recipes-security/cryptmount/files/remove_linux_fs.patch b/recipes-security/cryptmount/files/remove_linux_fs.patch new file mode 100644 index 0000000..304b853 --- /dev/null +++ b/recipes-security/cryptmount/files/remove_linux_fs.patch @@ -0,0 +1,19 @@ +# From glibc 2.36, (included from ) and +# (included from glibc) are no longer compatible: +# https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending +Signed-off-by: Armin Kuster + +Index: cryptmount-5.3.3/cryptmount.c +=================================================================== +--- cryptmount-5.3.3.orig/cryptmount.c ++++ cryptmount-5.3.3/cryptmount.c +@@ -41,7 +41,6 @@ + #ifdef HAVE_SYSLOG + # include + #endif +-#include /* Beware ordering conflict with sys/mount.h */ + + + #include "armour.h" -- cgit v1.2.3-54-g00ecf