#1 Fix FTBFS with glibc 2.28 (#1676036)
Closed a month ago by bruno. Opened a month ago by swt2c.
rpms/ swt2c/squashfs-tools fix_ftbfs  into  master

@@ -0,0 +1,44 @@ 

+ From 968aa53dd6d2c0831a9af01873441767c06b88d0 Mon Sep 17 00:00:00 2001

+ From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

+ Date: Wed, 1 Aug 2018 12:17:10 +0200

+ Subject: [PATCH] mksquashfs/unsquashfs: fix compilation with glibc 2.25+

+ MIME-Version: 1.0

+ Content-Type: text/plain; charset=UTF-8

+ Content-Transfer-Encoding: 8bit

+ 

+ From glibc 2.25 release notes:

+ https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html

+ "* The inclusion of <sys/sysmacros.h> by <sys/types.h> is deprecated.

+   This means that in a future release, the macros “major”, “minor”, and

+   “makedev” will only be available from <sys/sysmacros.h>."

+ 

+ See glibc bug https://sourceware.org/bugzilla/show_bug.cgi?id=19239 .

+ ---

+  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 d696a517..8d57c3ec 100644

+ --- a/squashfs-tools/mksquashfs.c

+ +++ b/squashfs-tools/mksquashfs.c

+ @@ -35,6 +35,7 @@

+  #include <stddef.h>

+  #include <sys/types.h>

+  #include <sys/stat.h>

+ +#include <sys/sysmacros.h>

+  #include <fcntl.h>

+  #include <errno.h>

+  #include <dirent.h>

+ diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c

+ index a57f85c1..a492b27b 100644

+ --- a/squashfs-tools/unsquashfs.c

+ +++ b/squashfs-tools/unsquashfs.c

+ @@ -32,6 +32,7 @@

+  #include "stdarg.h"

+  

+  #include <sys/sysinfo.h>

+ +#include <sys/sysmacros.h>

+  #include <sys/types.h>

+  #include <sys/time.h>

+  #include <sys/resource.h>

file modified
+7 -1

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

  Patch3:  cve-2015-4645.patch

  # Update formats to match changes in cve-2015-4645.patch

  Patch4:  local-cve-fix.patch

+ # From https://github.com/plougher/squashfs-tools/pull/52

+ Patch5:  fix-ftbfs-with-glibc-2.28.patch

  BuildRequires:  gcc

  BuildRequires: zlib-devel

  BuildRequires: xz-devel

@@ -42,6 +44,7 @@ 

  %patch2 -p0

  %patch3 -p1

  %patch4 -p0

+ %patch5 -p1

  

  %build

  pushd squashfs-tools

@@ -64,6 +67,9 @@ 

  %{_sbindir}/unsquashfs

  

  %changelog

+ * Fri May 10 2019 Scott Talbert <swt@techie.net> - 4.3-19

+ - Fix FTBFS with glibc 2.28 (#1676036)

+ 

  * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-18

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

  

no initial comment

Pull-Request has been closed by bruno

a month ago

I was expecting to be able to add a comment while closing, but apparently I need to do it separately.
Thanks for suggesting the fix. Unfortunately, I am using squashfs-tools as a way to get back up to speed on current maintenance practices and didn't realize that there were pagure instances per package. So I did a similar change before I knew about yours. If I had, I would have just pulled it.

Pull-Request has been reopened by bruno

a month ago

I want to see if reopening this kicks off a new test I set up. It probably won't because there is almost certainly a merge conflict. If it doesn't I manually do another build just to test it.

Pull-Request has been closed by bruno

a month ago