Hi,

On Thu, 9 Jul 2020 13:10:03 +0200 Lucas Nussbaum <lu...@debian.org> wrote:
> During a rebuild of all packages in sid, your package failed to build on
> amd64.

I backported a commit from upstream that fixes this issue:

https://github.com/dex4er/fakechroot/commit/b42d1fb9538f680af2f31e864c555414ccba842a

and prepared an NMU. Debdiff is attached. I uploaded with a delay, so that you
can still cancel it in case I messed up.

Thanks!

cheers, josch
diff -Nru fakechroot-2.19/debian/changelog fakechroot-2.19/debian/changelog
--- fakechroot-2.19/debian/changelog	2019-01-27 16:34:19.000000000 +0100
+++ fakechroot-2.19/debian/changelog	2020-08-29 13:06:33.000000000 +0200
@@ -1,3 +1,11 @@
+fakechroot (2.19-3.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add support for statx call by cherry-picking upstream commit (closes:
+    #964668)
+
+ -- Johannes 'josch' Schauer <jo...@debian.org>  Sat, 29 Aug 2020 13:06:33 +0200
+
 fakechroot (2.19-3.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru fakechroot-2.19/debian/patches/0001-New-statx-function.patch fakechroot-2.19/debian/patches/0001-New-statx-function.patch
--- fakechroot-2.19/debian/patches/0001-New-statx-function.patch	1970-01-01 01:00:00.000000000 +0100
+++ fakechroot-2.19/debian/patches/0001-New-statx-function.patch	2020-08-29 13:01:36.000000000 +0200
@@ -0,0 +1,80 @@
+From b42d1fb9538f680af2f31e864c555414ccba842a Mon Sep 17 00:00:00 2001
+From: Piotr Roszatycki <piotr.roszaty...@gmail.com>
+Date: Mon, 10 Feb 2020 13:59:10 -0800
+Subject: [PATCH] New `statx` function
+
+---
+ NEWS.md         |  1 +
+ configure.ac    |  1 +
+ src/Makefile.am |  1 +
+ src/statx.c     | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 47 insertions(+)
+ create mode 100644 src/statx.c
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -265,6 +265,7 @@ AC_CHECK_FUNCS(m4_normalize([
+     statfs64
+     statvfs
+     statvfs64
++    statx
+     stpcpy
+     strchrnul
+     strlcpy
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -151,6 +151,7 @@ libfakechroot_la_SOURCES = \
+     statfs64.c \
+     statvfs.c \
+     statvfs64.c \
++    statx.c \
+     stpcpy.c \
+     strchrnul.c \
+     strchrnul.h \
+--- /dev/null
++++ b/src/statx.c
+@@ -0,0 +1,44 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010-2020 Piotr Roszatycki <dex...@debian.org>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include <config.h>
++
++#ifdef HAVE_STATX
++
++#define _GNU_SOURCE
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
++#include "libfakechroot.h"
++
++
++wrapper(statx, int, (int dirfd, const char * pathname, int flags, unsigned int mask, struct statx * statxbuf))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("statx(%d, \"%s\", %d, %u, &statxbuf)", dirfd, pathname, flags, mask);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(statx)(dirfd, pathname, flags, mask, statxbuf);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
diff -Nru fakechroot-2.19/debian/patches/series fakechroot-2.19/debian/patches/series
--- fakechroot-2.19/debian/patches/series	2019-01-27 16:28:35.000000000 +0100
+++ fakechroot-2.19/debian/patches/series	2020-08-29 13:01:07.000000000 +0200
@@ -1,2 +1,3 @@
 renameat2.patch
 disable-jemalloc-test
+0001-New-statx-function.patch

Attachment: signature.asc
Description: signature

Reply via email to