Commit b6e2bfa6 authored by Johannes 'josch' Schauer's avatar Johannes 'josch' Schauer Committed by Piotr Roszatycki

Import Debian changes 2.19-3.1

fakechroot (2.19-3.1) unstable; urgency=medium

  * Non-maintainer upload.
  * add support for wrapping renameat2 (closes: #909612)
parent 27c38fdf
# Autotools
*.log
Makefile
Makefile.in
/aclocal.m4
/autom4te.cache
/build-aux/
/config.cache
/config.guess
/config.h
/config.h.in
/config.log
/config.sh
/config.status
/config.sub
/configure
/install-sh
/m4/libtool.m4
/m4/ltoptions.m4
/m4/ltsugar.m4
/m4/ltversion.m4
/m4/lt~obsolete.m4
/missing
/stamp-h1
# Libtool
*.la
*.lo
*.o
.deps/
.libs/
/libtool
/ltmain.sh
# pod2man
*.1
*.8
# scripts
/scripts/*.env
/scripts/*.fakechroot
/scripts/fakechroot
# Tests
*.trs
.proverc
/test/*.debs.tgz
/test/*.rpms.tgz
/test/rinse-cache/
/test/src/test-*
!/test/src/test-*.c
/test/testtree/
/test/testtree-*/
# Java
*.class
*.jar
# Dist
*.gz
# quilt
/.pc
# Editors
*~
# Eclipse
/.autotools
/.cproject
/.project
/.settings/
sudo: required
dist: trusty
language: c
before_script:
- export LC_ALL=C LC_TYPE=C LANG=
- sudo apt-get install debian-archive-keyring
- echo 'deb http://ftp.de.debian.org/debian/ sid main' | sudo tee -a /etc/apt/sources.list
- sudo apt-get update
- sudo apt-get -o Dpkg::Options::="--force-overwrite" install -yy build-essential colorgcc dpkg-dev debhelper dh-autoreconf fakeroot git-buildpackage libjemalloc1
- git fetch origin +upstream:upstream
- git fetch origin +pristine-tar:pristine-tar
script: >
gbp buildpackage --git-builder="debuild --set-envvar=CC=$TRAVIS_CC --no-lintian -i'^\.git/|^\.gitignore$|^\.travis.yml$|^README\.md$' -I" -uc -us &&
cat ../*.changes &&
debc &&
lintian --dont-check-part standards-version --fail-on-warnings --color always --info ../*.changes &&
sudo dpkg --install ../*.deb
env:
global:
- TRAVIS_CC=colorgcc
- DEB_BUILD_OPTIONS='parallel=4'
- LINTIAN_PROFILE=debian
......@@ -3,8 +3,7 @@
**Home** | [Download](https://github.com/fakechroot/fakechroot/wiki/Download) | [Documentation](https://github.com/fakechroot/fakechroot/blob/master/man/fakechroot.pod) | [ChangeLog](https://github.com/fakechroot/fakechroot/blob/master/NEWS.md) | [Development](https://github.com/fakechroot/fakechroot/wiki/Development) | [ToDo](https://github.com/fakechroot/fakechroot/wiki/Todo) | [Links](https://github.com/fakechroot/fakechroot/wiki/Links)
[![Upstream Build Status](https://travis-ci.org/dex4er/fakechroot.png?branch=master)](https://travis-ci.org/dex4er/fakechroot)
[![Package Build Status](https://travis-ci.org/dex4er/deb-fakechroot.png?branch=master)](https://travis-ci.org/dex4er/deb-fakechroot)
[![Build Status](https://travis-ci.org/dex4er/fakechroot.png?branch=master)](https://travis-ci.org/dex4er/fakechroot)
What is it?
......
/*.debhelper
/*.log
/*.substvars
/*-stamp
/autoreconf.*
/files
/tmp/
/fakechroot/
/libfakechroot/
fakechroot (2.19-3.1) unstable; urgency=medium
* Non-maintainer upload.
* add support for wrapping renameat2 (closes: #909612)
-- Johannes 'josch' Schauer <josch@debian.org> Tue, 01 Jan 2019 08:05:21 +0100
fakechroot (2.19-3) unstable; urgency=high
* Correct autoconf variables for configure. The paths should be
......
From: Johannes 'josch' Schauer <josch@debian.org>
Date: Tue, 01 Jan 2019 08:05:21 +0100
Subject: add support for renameat2 system call
--- a/config.h.in
+++ b/config.h.in
@@ -526,6 +526,9 @@
/* Define to 1 if you have the `renameat' function. */
#undef HAVE_RENAMEAT
+/* Define to 1 if you have the `renameat2' function. */
+#undef HAVE_RENAMEAT2
+
/* Define to 1 if you have the `revoke' function. */
#undef HAVE_REVOKE
--- a/configure.ac
+++ b/configure.ac
@@ -252,6 +252,7 @@ AC_CHECK_FUNCS(m4_normalize([
removexattr
rename
renameat
+ renameat2
revoke
rmdir
scandir
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,6 +135,7 @@ libfakechroot_la_SOURCES = \
removexattr.c \
rename.c \
renameat.c \
+ renameat2.c \
revoke.c \
rmdir.c \
rpl_lstat.c \
--- /dev/null
+++ b/src/renameat2.c
@@ -0,0 +1,42 @@
+/*
+ libfakechroot -- fake chroot environment
+ Copyright (c) 2010, 2013 Piotr Roszatycki <dexter@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_RENAMEAT2
+
+#define _ATFILE_SOURCE
+#include "libfakechroot.h"
+
+
+wrapper(renameat2, int, (int olddirfd, const char * oldpath, int newdirfd, const char * newpath, unsigned int flags))
+{
+ char tmp[FAKECHROOT_PATH_MAX];
+ debug("renameat2(%d, \"%s\", %d, \"%s\", %d)", olddirfd, oldpath, newdirfd, newpath, flags);
+ expand_chroot_path_at(olddirfd, oldpath);
+ strcpy(tmp, oldpath);
+ oldpath = tmp;
+ expand_chroot_path_at(newdirfd, newpath);
+ return nextcall(renameat2)(olddirfd, oldpath, newdirfd, newpath, flags);
+}
+
+#else
+typedef int empty_translation_unit;
+#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment