diff --git a/glibc.patch b/glibc.patch new file mode 100644 index 0000000..87c63b1 --- /dev/null +++ b/glibc.patch @@ -0,0 +1,20 @@ +--- squashfs-tools/mksquashfs.c.orig 2019-05-21 01:50:02.197183719 -0500 ++++ squashfs-tools/mksquashfs.c 2019-05-21 01:51:05.818179903 -0500 +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + + #ifndef linux + #define __BYTE_ORDER BYTE_ORDER +--- squashfs-tools/unsquashfs.c.orig 2019-05-21 01:57:45.984155904 -0500 ++++ squashfs-tools/unsquashfs.c 2019-05-21 01:58:39.837152674 -0500 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + struct cache *fragment_cache, *data_cache; + struct queue *to_reader, *to_inflate, *to_writer, *from_writer; diff --git a/squashfs-tools.spec b/squashfs-tools.spec index 2f2acc0..c3183ee 100644 --- a/squashfs-tools.spec +++ b/squashfs-tools.spec @@ -1,7 +1,7 @@ Summary: Utility for the creation of squashfs filesystems Name: squashfs-tools Version: 4.3 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: http://squashfs.sourceforge.net/ Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz @@ -24,6 +24,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 is no longer included by sys/types.h +Patch5: glibc.patch BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: xz-devel @@ -42,6 +44,7 @@ contains the utilities for manipulating squashfs filesystems. %patch2 -p0 %patch3 -p1 %patch4 -p0 +%patch5 -p0 %build pushd squashfs-tools @@ -64,6 +67,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1 %{_sbindir}/unsquashfs %changelog +* Tue May 21 2019 Bruno Wolff III - 4.3-19 +- Fix issue with glibc changes + * Sun Feb 03 2019 Fedora Release Engineering - 4.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild