diff options
author | Armin Kuster <akuster808@gmail.com> | 2022-08-15 07:54:39 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2022-08-25 08:15:58 -0400 |
commit | aa57a13788b33df008bc58f239abd43b7941b122 (patch) | |
tree | 9fd25cb0374a656d4966734f9654e8ea92072e43 /recipes-security | |
parent | ea5bb2f2e7c3e4e3b7879b05085af6e537355fdd (diff) | |
download | meta-security-aa57a13788b33df008bc58f239abd43b7941b122.tar.gz |
cyptmount: Fix mount.h conflicts seen with glibc 2.36+
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security')
-rw-r--r-- | recipes-security/cryptmount/cryptmount_5.3.3.bb | 4 | ||||
-rw-r--r-- | recipes-security/cryptmount/files/remove_linux_fs.patch | 19 |
2 files changed, 22 insertions, 1 deletions
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/" | |||
3 | LIC_FILES_CHKSUM = "file://README;beginline=3;endline=4;md5=673a990de93a2c5531a0f13f1c40725a" | 3 | LIC_FILES_CHKSUM = "file://README;beginline=3;endline=4;md5=673a990de93a2c5531a0f13f1c40725a" |
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | 5 | ||
6 | SRC_URI = "https://sourceforge.net/projects/cryptmount/files/${BPN}/${BPN}-5.3/${BPN}-${PV}.tar.gz" | 6 | SRC_URI = "https://sourceforge.net/projects/cryptmount/files/${BPN}/${BPN}-5.3/${BPN}-${PV}.tar.gz \ |
7 | file://remove_linux_fs.patch \ | ||
8 | " | ||
7 | 9 | ||
8 | SRC_URI[sha256sum] = "682953ff5ba497d48d6b13e22ca726c98659abd781bb8596bb299640dd255d9b" | 10 | SRC_URI[sha256sum] = "682953ff5ba497d48d6b13e22ca726c98659abd781bb8596bb299640dd255d9b" |
9 | 11 | ||
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 @@ | |||
1 | # From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and | ||
2 | # <sys/mount.h> (included from glibc) are no longer compatible: | ||
3 | # https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
7 | |||
8 | Index: cryptmount-5.3.3/cryptmount.c | ||
9 | =================================================================== | ||
10 | --- cryptmount-5.3.3.orig/cryptmount.c | ||
11 | +++ cryptmount-5.3.3/cryptmount.c | ||
12 | @@ -41,7 +41,6 @@ | ||
13 | #ifdef HAVE_SYSLOG | ||
14 | # include <syslog.h> | ||
15 | #endif | ||
16 | -#include <linux/fs.h> /* Beware ordering conflict with sys/mount.h */ | ||
17 | |||
18 | |||
19 | #include "armour.h" | ||