patches/squashfs-tools/0010-fix_FTBFS_with_glibc_2.28.patch

   1 Description: fix FTBFS with glibc 2.28
   2  .
   3 Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
   4 Bug-Debian: https://bugs.debian.org/916014
   5 Forwarded: no
   6 Last-Update: 2018-12-09
   7
   8 ---
   9
  10 --- squashfs-tools-4.3.orig/squashfs-tools/mksquashfs.c
  11 +++ squashfs-tools-4.3/squashfs-tools/mksquashfs.c
  12 @@ -35,6 +35,7 @@
  13  #include <stddef.h>
  14  #include <sys/types.h>
  15  #include <sys/stat.h>
  16 +#include <sys/sysmacros.h>
  17  #include <fcntl.h>
  18  #include <errno.h>
  19  #include <dirent.h>
  20 @@ -986,49 +987,49 @@ int create_inode(squashfs_inode *i_no, s
  21         }
  22         else if(type == SQUASHFS_CHRDEV_TYPE || type == SQUASHFS_BLKDEV_TYPE) {
  23                 struct squashfs_dev_inode_header *dev = &inode_header.dev;
  24 -               unsigned int major = major(buf->st_rdev);
  25 -               unsigned int minor = minor(buf->st_rdev);
  26 +               unsigned int i_major = major(buf->st_rdev);
  27 +               unsigned int i_minor = minor(buf->st_rdev);
  28
  29 -               if(major > 0xfff) {
  30 +               if(i_major > 0xfff) {
  31                         ERROR("Major %d out of range in device node %s, "
  32 -                               "truncating to %d\n", major, filename,
  33 -                               major & 0xfff);
  34 -                       major &= 0xfff;
  35 +                               "truncating to %d\n", i_major, filename,
  36 +                               i_major & 0xfff);
  37 +                       i_major &= 0xfff;
  38                 }
  39 -               if(minor > 0xfffff) {
  40 +               if(i_minor > 0xfffff) {
  41                         ERROR("Minor %d out of range in device node %s, "
  42 -                               "truncating to %d\n", minor, filename,
  43 -                               minor & 0xfffff);
  44 -                       minor &= 0xfffff;
  45 +                               "truncating to %d\n", i_minor, filename,
  46 +                               i_minor & 0xfffff);
  47 +                       i_minor &= 0xfffff;
  48                 }
  49                 inode = get_inode(sizeof(*dev));
  50                 dev->nlink = nlink;
  51 -               dev->rdev = (major << 8) | (minor & 0xff) |
  52 -                               ((minor & ~0xff) << 12);
  53 +               dev->rdev = (i_major << 8) | (i_minor & 0xff) |
  54 +                               ((i_minor & ~0xff) << 12);
  55                 SQUASHFS_SWAP_DEV_INODE_HEADER(dev, inode);
  56                 TRACE("Device inode, rdev 0x%x, nlink %d\n", dev->rdev, nlink);
  57         }
  58         else if(type == SQUASHFS_LCHRDEV_TYPE || type == SQUASHFS_LBLKDEV_TYPE) {
  59                 struct squashfs_ldev_inode_header *dev = &inode_header.ldev;
  60 -               unsigned int major = major(buf->st_rdev);
  61 -               unsigned int minor = minor(buf->st_rdev);
  62 +               unsigned int i_major = major(buf->st_rdev);
  63 +               unsigned int i_minor = minor(buf->st_rdev);
  64
  65 -               if(major > 0xfff) {
  66 +               if(i_major > 0xfff) {
  67                         ERROR("Major %d out of range in device node %s, "
  68 -                               "truncating to %d\n", major, filename,
  69 -                               major & 0xfff);
  70 -                       major &= 0xfff;
  71 +                               "truncating to %d\n", i_major, filename,
  72 +                               i_major & 0xfff);
  73 +                       i_major &= 0xfff;
  74                 }
  75 -               if(minor > 0xfffff) {
  76 +               if(i_minor > 0xfffff) {
  77                         ERROR("Minor %d out of range in device node %s, "
  78 -                               "truncating to %d\n", minor, filename,
  79 -                               minor & 0xfffff);
  80 -                       minor &= 0xfffff;
  81 +                               "truncating to %d\n", i_minor, filename,
  82 +                               i_minor & 0xfffff);
  83 +                       i_minor &= 0xfffff;
  84                 }
  85                 inode = get_inode(sizeof(*dev));
  86                 dev->nlink = nlink;
  87 -               dev->rdev = (major << 8) | (minor & 0xff) |
  88 -                               ((minor & ~0xff) << 12);
  89 +               dev->rdev = (i_major << 8) | (i_minor & 0xff) |
  90 +                               ((i_minor & ~0xff) << 12);
  91                 dev->xattr = xattr;
  92                 SQUASHFS_SWAP_LDEV_INODE_HEADER(dev, inode);
  93                 TRACE("Device inode, rdev 0x%x, nlink %d\n", dev->rdev, nlink);
  94 --- squashfs-tools-4.3.orig/squashfs-tools/unsquashfs.c
  95 +++ squashfs-tools-4.3/squashfs-tools/unsquashfs.c
  96 @@ -35,6 +35,7 @@
  97  #include <sys/types.h>
  98  #include <sys/time.h>
  99  #include <sys/resource.h>
 100 +#include <sys/sysmacros.h>
 101  #include <limits.h>
 102  #include <ctype.h>
 103