mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-01-11 15:00:34 +00:00
Code Issues Projects Releases Wiki Activity

cyptmount: Fix mount.h conflicts seen with glibc 2.36+

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2022-08-15 07:54:39 -07:00
parent ea5bb2f2e7
commit aa57a13788
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-security/cryptmount/cryptmount_5.3.3.bb
View File

@@ -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"

19
recipes-security/cryptmount/files/remove_linux_fs.patch Normal file
View File

@@ -0,0 +1,19 @@
# From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and
# <sys/mount.h> (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 <akuster808@gmail.com>
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 <syslog.h>
#endif
-#include <linux/fs.h> /* Beware ordering conflict with sys/mount.h */
#include "armour.h"