Attachment 1503859 Details for Bug 1648490 – Patch 0001: add missing include files (gcc 8.2.1 complains of major/minor() being undefined)

[patch] Patch 0001: add missing include files (gcc 8.2.1 complains of major/minor() being undefined)

0001-Add-missing-Include.patch (text/plain), 2.16 KB, created by John Friend on 2018-11-09 22:04:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Friend

Created: 2018-11-09 22:04:17 UTC

Size: 2.16 KB

patch

obsolete

>From 913b53ec5f75df4b9feb2be3bebecd151d3cb19f Mon Sep 17 00:00:00 2001
>From: root <root@localhost>
>Date: Sat, 10 Nov 2018 00:26:44 +0300
>Subject: [PATCH 1/2] Add missing Include
>
>---
> 0001-Add-missing-Include.patch | 37 ++++++++++++++++++++++++++++++++++
> squashfs-tools.spec            |  3 +++
> 2 files changed, 40 insertions(+)
> create mode 100644 0001-Add-missing-Include.patch
>
>diff --git a/0001-Add-missing-Include.patch b/0001-Add-missing-Include.patch
>new file mode 100644
>index 0000000..e66da7d
>--- /dev/null
>+++ b/0001-Add-missing-Include.patch
>@@ -0,0 +1,37 @@
>+From 892db4ce5e1d54045a379f5f52a1ed1f2cca5c29 Mon Sep 17 00:00:00 2001
>+From: root <root@localhost>
>+Date: Sat, 10 Nov 2018 00:22:46 +0300
>+Subject: [PATCH] Add missing Include
>+
>+---
>+ squashfs-tools/mksquashfs.c | 1 +
>+ squashfs-tools/unsquashfs.c | 1 +
>+ 2 files changed, 2 insertions(+)
>+
>+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
>+index 9427919..5742fe9 100644
>+--- a/squashfs-tools/mksquashfs.c
>++++ b/squashfs-tools/mksquashfs.c
>+@@ -44,6 +44,7 @@
>+ #include <setjmp.h>
>+ #include <sys/types.h>
>+ #include <sys/mman.h>
>++#include <sys/sysmacros.h>
>+ #include <pthread.h>
>+ #include <regex.h>
>+ #include <fnmatch.h>
>+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
>+index 1323dd6..846c74b 100644
>+--- a/squashfs-tools/unsquashfs.c
>++++ b/squashfs-tools/unsquashfs.c
>+@@ -35,6 +35,7 @@
>+ #include <sys/types.h>
>+ #include <sys/time.h>
>+ #include <sys/resource.h>
>++#include <sys/sysmacros.h>
>+ #include <limits.h>
>+ #include <ctype.h>
>+ 
>+-- 
>+2.19.1
>+
>diff --git a/squashfs-tools.spec b/squashfs-tools.spec
>index b5af18c..df1b6c9 100644
>--- a/squashfs-tools.spec
>+++ b/squashfs-tools.spec
>@@ -25,6 +25,8 @@ Patch2:  2gb.patch
> Patch3:  cve-2015-4645.patch
> # Update formats to match changes in cve-2015-4645.patch
> Patch4:  local-cve-fix.patch
>+# sys/sysmacros.h defines major()/minor()
>+Patch5:  0001-Add-missing-Include.patch
> BuildRequires:  gcc
> BuildRequires: zlib-devel
> BuildRequires: xz-devel
>@@ -43,6 +45,7 @@ contains the utilities for manipulating squashfs filesystems.
> %patch2 -p0
> %patch3 -p1
> %patch4 -p0
>+%patch5 -p1
> 
> %build
> pushd squashfs-tools
>-- 
>2.19.1
>

Actions: View | Diff

Attachments on bug 1648490: 1503859 | 1503860 | 1503861