Compare commits
1 Commits
rawhide
...
epel8-play
| Author | SHA1 | Date |
|---|---|---|
Troy Dawson
|
b034194ed4 |
|
|
@ -1,5 +0,0 @@
|
|||
fakechroot_2.9.orig.tar.gz
|
||||
/fakechroot-2.17.2.tar.gz
|
||||
/fakechroot-2.18.tar.gz
|
||||
/fakechroot-2.19.tar.gz
|
||||
/fakechroot-2.20.1.tar.gz
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From 534e6d555736b97211523970d378dfb0db2608e9 Mon Sep 17 00:00:00 2001
|
||||
From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||
Date: Mon, 22 Feb 2021 21:44:07 -0800
|
||||
Subject: [PATCH] tmpnam.c: fix heap overflow
|
||||
|
||||
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||
---
|
||||
src/tmpnam.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tmpnam.c b/src/tmpnam.c
|
||||
index ce60817..917ee6b 100644
|
||||
--- a/src/tmpnam.c
|
||||
+++ b/src/tmpnam.c
|
||||
@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s))
|
||||
|
||||
expand_chroot_path(ptr);
|
||||
|
||||
- ptr2 = malloc(strlen(ptr));
|
||||
+ ptr2 = malloc(strlen(ptr) + 1);
|
||||
if (ptr2 == NULL) return NULL;
|
||||
|
||||
strcpy(ptr2, ptr);
|
||||
|
|
@ -1,213 +0,0 @@
|
|||
From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001
|
||||
From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||
Date: Mon, 22 Feb 2021 21:47:09 -0800
|
||||
Subject: [PATCH] fix glibc 2.33+ compatibility
|
||||
|
||||
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||
---
|
||||
configure.ac | 20 ++++++++++++++++++++
|
||||
src/ftw.c | 2 +-
|
||||
src/ftw64.c | 14 +++++++++++---
|
||||
src/libfakechroot.h | 15 +++++++++++++++
|
||||
src/lstat.c | 2 +-
|
||||
src/lstat.h | 2 +-
|
||||
src/lstat64.c | 2 +-
|
||||
src/mknod.c | 2 +-
|
||||
src/mknodat.c | 2 +-
|
||||
src/stat.c | 2 +-
|
||||
src/stat64.c | 2 +-
|
||||
11 files changed, 54 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f8cdb32..9cc2e77 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY
|
||||
# Checks for libraries.
|
||||
AC_CHECK_LIB([dl], [dlsym])
|
||||
|
||||
+AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33])
|
||||
+AC_MSG_CHECKING([for glibc 2.33+])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
+ #include <sys/stat.h>
|
||||
+ ]], [[
|
||||
+#ifdef __GLIBC__
|
||||
+#if !__GLIBC_PREREQ(2,33)
|
||||
+#error glibc<2.33
|
||||
+#endif
|
||||
+#else
|
||||
+#error not glibc
|
||||
+#endif
|
||||
+ ]])],[
|
||||
+ AC_DEFINE(NEW_GLIBC,1)
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ ],[
|
||||
+ AC_DEFINE(NEW_GLIBC,0)
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ ])
|
||||
+
|
||||
# Checks for header files.
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_STDC
|
||||
diff --git a/src/ftw.c b/src/ftw.c
|
||||
index 92fc126..a9abc85 100644
|
||||
--- a/src/ftw.c
|
||||
+++ b/src/ftw.c
|
||||
@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *);
|
||||
# define NFTW_NEW_NAME __new_nftw
|
||||
# define INO_T ino_t
|
||||
# define STAT stat
|
||||
-# ifdef _LIBC
|
||||
+# if defined(_LIBC) && !NEW_GLIBC
|
||||
# define LXSTAT __lxstat
|
||||
# define XSTAT __xstat
|
||||
# define FXSTATAT __fxstatat
|
||||
diff --git a/src/ftw64.c b/src/ftw64.c
|
||||
index 7cc8cdf..cee1f2b 100644
|
||||
--- a/src/ftw64.c
|
||||
+++ b/src/ftw64.c
|
||||
@@ -18,6 +18,8 @@
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#define __FTW64_C
|
||||
#define FTW_NAME ftw64
|
||||
#define NFTW_NAME nftw64
|
||||
@@ -25,9 +27,15 @@
|
||||
#define NFTW_NEW_NAME __new_nftw64
|
||||
#define INO_T ino64_t
|
||||
#define STAT stat64
|
||||
-#define LXSTAT __lxstat64
|
||||
-#define XSTAT __xstat64
|
||||
-#define FXSTATAT __fxstatat64
|
||||
+#if NEW_GLIBC
|
||||
+# define LXSTAT(V,f,sb) lstat64 (f,sb)
|
||||
+# define XSTAT(V,f,sb) stat64 (f,sb)
|
||||
+# define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m)
|
||||
+#else
|
||||
+# define LXSTAT __lxstat64
|
||||
+# define XSTAT __xstat64
|
||||
+# define FXSTATAT __fxstatat64
|
||||
+#endif
|
||||
#define FTW_FUNC_T __ftw64_func_t
|
||||
#define NFTW_FUNC_T __nftw64_func_t
|
||||
|
||||
diff --git a/src/libfakechroot.h b/src/libfakechroot.h
|
||||
index 4cf199f..64ff15f 100644
|
||||
--- a/src/libfakechroot.h
|
||||
+++ b/src/libfakechroot.h
|
||||
@@ -200,6 +200,21 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+#ifndef _STAT_VER
|
||||
+ #if defined (__aarch64__)
|
||||
+ #define _STAT_VER 0
|
||||
+ #elif defined (__powerpc__) && __WORDSIZE == 64
|
||||
+ #define _STAT_VER 1
|
||||
+ #elif defined (__riscv) && __riscv_xlen==64
|
||||
+ #define _STAT_VER 0
|
||||
+ #elif defined (__s390x__)
|
||||
+ #define _STAT_VER 1
|
||||
+ #elif defined (__x86_64__)
|
||||
+ #define _STAT_VER 1
|
||||
+ #else
|
||||
+ #define _STAT_VER 3
|
||||
+ #endif
|
||||
+#endif
|
||||
|
||||
typedef void (*fakechroot_wrapperfn_t)(void);
|
||||
|
||||
diff --git a/src/lstat.c b/src/lstat.c
|
||||
index 54e3263..fa38323 100644
|
||||
--- a/src/lstat.c
|
||||
+++ b/src/lstat.c
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
-#ifndef HAVE___LXSTAT
|
||||
+#if !defined(HAVE___LXSTAT) || NEW_GLIBC
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
diff --git a/src/lstat.h b/src/lstat.h
|
||||
index ee48303..c46a2b9 100644
|
||||
--- a/src/lstat.h
|
||||
+++ b/src/lstat.h
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <config.h>
|
||||
#include "libfakechroot.h"
|
||||
|
||||
-#ifndef HAVE___LXSTAT
|
||||
+#if !defined(HAVE___LXSTAT) || NEW_GLIBC
|
||||
|
||||
wrapper_proto(lstat, int, (const char *, struct stat *));
|
||||
|
||||
diff --git a/src/lstat64.c b/src/lstat64.c
|
||||
index b6212fc..a332d7c 100644
|
||||
--- a/src/lstat64.c
|
||||
+++ b/src/lstat64.c
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
-#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64)
|
||||
+#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC)
|
||||
|
||||
#define _LARGEFILE64_SOURCE
|
||||
#define _BSD_SOURCE
|
||||
diff --git a/src/mknod.c b/src/mknod.c
|
||||
index 2771037..aeb750b 100644
|
||||
--- a/src/mknod.c
|
||||
+++ b/src/mknod.c
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
-#ifndef HAVE___XMKNOD
|
||||
+#if !defined(HAVE___XMKNOD) || NEW_GLIBC
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include "libfakechroot.h"
|
||||
diff --git a/src/mknodat.c b/src/mknodat.c
|
||||
index 732a22b..3239b35 100644
|
||||
--- a/src/mknodat.c
|
||||
+++ b/src/mknodat.c
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
-#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT)
|
||||
+#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC)
|
||||
|
||||
#define _ATFILE_SOURCE
|
||||
#include <sys/stat.h>
|
||||
diff --git a/src/stat.c b/src/stat.c
|
||||
index 7b37793..5ef57ba 100644
|
||||
--- a/src/stat.c
|
||||
+++ b/src/stat.c
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
-#ifndef HAVE___XSTAT
|
||||
+#if !defined(HAVE___XSTAT) || NEW_GLIBC
|
||||
|
||||
#define _BSD_SOURCE
|
||||
#define _DEFAULT_SOURCE
|
||||
diff --git a/src/stat64.c b/src/stat64.c
|
||||
index a360f66..993ce80 100644
|
||||
--- a/src/stat64.c
|
||||
+++ b/src/stat64.c
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
-#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64)
|
||||
+#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC)
|
||||
|
||||
#define _BSD_SOURCE
|
||||
#define _LARGEFILE64_SOURCE
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001
|
||||
From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||
Date: Mon, 22 Feb 2021 21:46:36 -0800
|
||||
Subject: [PATCH] declare missing bufs, remove ver from lstat
|
||||
|
||||
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
||||
---
|
||||
src/lstat.c | 8 +++++---
|
||||
src/lstat.h | 2 +-
|
||||
src/mknod.c | 2 ++
|
||||
src/stat.c | 2 ++
|
||||
src/stat64.c | 2 ++
|
||||
5 files changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/lstat.c b/src/lstat.c
|
||||
index 3f6d819..54e3263 100644
|
||||
--- a/src/lstat.c
|
||||
+++ b/src/lstat.c
|
||||
@@ -28,9 +28,11 @@
|
||||
#include "lstat.h"
|
||||
|
||||
|
||||
-wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
|
||||
+wrapper(lstat, int, (const char * filename, struct stat * buf))
|
||||
{
|
||||
- debug("lstat(%d, \"%s\", &buf)", ver, filename);
|
||||
+ char fakechroot_abspath[FAKECHROOT_PATH_MAX];
|
||||
+ char fakechroot_buf[FAKECHROOT_PATH_MAX];
|
||||
+ debug("lstat(\"%s\", &buf)", filename);
|
||||
|
||||
if (!fakechroot_localdir(filename)) {
|
||||
if (filename != NULL) {
|
||||
@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
|
||||
}
|
||||
}
|
||||
|
||||
- return lstat_rel(ver, filename, buf);
|
||||
+ return lstat_rel(filename, buf);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/src/lstat.h b/src/lstat.h
|
||||
index 751c1ea..ee48303 100644
|
||||
--- a/src/lstat.h
|
||||
+++ b/src/lstat.h
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#ifndef HAVE___LXSTAT
|
||||
|
||||
-wrapper_proto(lstat, int, (int, const char *, struct stat *));
|
||||
+wrapper_proto(lstat, int, (const char *, struct stat *));
|
||||
|
||||
int lstat_rel(const char *, struct stat *);
|
||||
|
||||
diff --git a/src/mknod.c b/src/mknod.c
|
||||
index 52fd33b..2771037 100644
|
||||
--- a/src/mknod.c
|
||||
+++ b/src/mknod.c
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev))
|
||||
{
|
||||
+ char fakechroot_abspath[FAKECHROOT_PATH_MAX];
|
||||
+ char fakechroot_buf[FAKECHROOT_PATH_MAX];
|
||||
debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev);
|
||||
expand_chroot_path(pathname);
|
||||
return nextcall(mknod)(pathname, mode, dev);
|
||||
diff --git a/src/stat.c b/src/stat.c
|
||||
index 7845662..7b37793 100644
|
||||
--- a/src/stat.c
|
||||
+++ b/src/stat.c
|
||||
@@ -33,6 +33,8 @@
|
||||
|
||||
wrapper(stat, int, (const char * file_name, struct stat * buf))
|
||||
{
|
||||
+ char fakechroot_abspath[FAKECHROOT_PATH_MAX];
|
||||
+ char fakechroot_buf[FAKECHROOT_PATH_MAX];
|
||||
debug("stat(\"%s\", &buf)", file_name);
|
||||
expand_chroot_path(file_name);
|
||||
return nextcall(stat)(file_name, buf);
|
||||
diff --git a/src/stat64.c b/src/stat64.c
|
||||
index aac9c75..a360f66 100644
|
||||
--- a/src/stat64.c
|
||||
+++ b/src/stat64.c
|
||||
@@ -34,6 +34,8 @@
|
||||
|
||||
wrapper(stat64, int, (const char * file_name, struct stat64 * buf))
|
||||
{
|
||||
+ char fakechroot_abspath[FAKECHROOT_PATH_MAX];
|
||||
+ char fakechroot_buf[FAKECHROOT_PATH_MAX];
|
||||
debug("stat64(\"%s\", &buf)", file_name);
|
||||
expand_chroot_path(file_name);
|
||||
return nextcall(stat64)(file_name, buf);
|
||||
137
86.patch
137
86.patch
|
|
@ -1,137 +0,0 @@
|
|||
From afd606ed43ca97a58db68e5add6e9a90f0a74c9b Mon Sep 17 00:00:00 2001
|
||||
From: neok-m4700 <neok-m4700@users.noreply.github.com>
|
||||
Date: Wed, 24 Feb 2021 17:36:57 +0100
|
||||
Subject: [PATCH] wrap fstatat and fstatat64
|
||||
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
src/Makefile.am | 2 ++
|
||||
src/fstatat.c | 42 ++++++++++++++++++++++++++++++++++++++++++
|
||||
src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 89 insertions(+)
|
||||
create mode 100644 src/fstatat.c
|
||||
create mode 100644 src/fstatat64.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f8cdb32..032dd3d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -198,6 +198,8 @@ AC_CHECK_FUNCS(m4_normalize([
|
||||
freopen64
|
||||
fstat
|
||||
fstat64
|
||||
+ fstatat
|
||||
+ fstatat64
|
||||
fts_children
|
||||
fts_open
|
||||
fts_read
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 6066345..eb311c0 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \
|
||||
fopen64.c \
|
||||
freopen.c \
|
||||
freopen64.c \
|
||||
+ fstatat.c \
|
||||
+ fstatat64.c \
|
||||
fts.c \
|
||||
fts64.c \
|
||||
ftw.c \
|
||||
diff --git a/src/fstatat.c b/src/fstatat.c
|
||||
new file mode 100644
|
||||
index 0000000..ca7578b
|
||||
--- /dev/null
|
||||
+++ b/src/fstatat.c
|
||||
@@ -0,0 +1,42 @@
|
||||
+/*
|
||||
+ libfakechroot -- fake chroot environment
|
||||
+ Copyright (c) 2010, 2021 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_FSTATAT
|
||||
+
|
||||
+#define _ATFILE_SOURCE
|
||||
+#define _POSIX_C_SOURCE 200809L
|
||||
+#include <sys/stat.h>
|
||||
+#include <limits.h>
|
||||
+#include "libfakechroot.h"
|
||||
+
|
||||
+wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags))
|
||||
+{
|
||||
+ char fakechroot_abspath[FAKECHROOT_PATH_MAX];
|
||||
+ char fakechroot_buf[FAKECHROOT_PATH_MAX];
|
||||
+ debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
|
||||
+ expand_chroot_path_at(dirfd, pathname);
|
||||
+ return nextcall(fstatat)(dirfd, pathname, buf, flags);
|
||||
+}
|
||||
+
|
||||
+#else
|
||||
+typedef int empty_translation_unit;
|
||||
+#endif
|
||||
diff --git a/src/fstatat64.c b/src/fstatat64.c
|
||||
new file mode 100644
|
||||
index 0000000..1863372
|
||||
--- /dev/null
|
||||
+++ b/src/fstatat64.c
|
||||
@@ -0,0 +1,43 @@
|
||||
+/*
|
||||
+ libfakechroot -- fake chroot environment
|
||||
+ Copyright (c) 2010, 2021 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_FSTATAT64
|
||||
+
|
||||
+#define _ATFILE_SOURCE
|
||||
+#define _POSIX_C_SOURCE 200809L
|
||||
+#define _LARGEFILE64_SOURCE
|
||||
+#include <sys/stat.h>
|
||||
+#include <limits.h>
|
||||
+#include "libfakechroot.h"
|
||||
+
|
||||
+wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags))
|
||||
+{
|
||||
+ char fakechroot_abspath[FAKECHROOT_PATH_MAX];
|
||||
+ char fakechroot_buf[FAKECHROOT_PATH_MAX];
|
||||
+ debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
|
||||
+ expand_chroot_path_at(dirfd, pathname);
|
||||
+ return nextcall(fstatat64)(dirfd, pathname, buf, flags);
|
||||
+}
|
||||
+
|
||||
+#else
|
||||
+typedef int empty_translation_unit;
|
||||
+#endif
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
From b42d1fb9538f680af2f31e864c555414ccba842a Mon Sep 17 00:00:00 2001
|
||||
From: Piotr Roszatycki <piotr.roszatycki@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
|
||||
|
||||
diff --git a/NEWS.md b/NEWS.md
|
||||
index 9de12fe..f1210bf 100644
|
||||
--- a/NEWS.md
|
||||
+++ b/NEWS.md
|
||||
@@ -1,5 +1,10 @@
|
||||
# NEWS
|
||||
|
||||
+XX Xxx XXXX
|
||||
+
|
||||
+* UNRELEASED
|
||||
+* New `statx(2)` function was added: glibc supports it since 2.28.
|
||||
+
|
||||
## Version 2.20.1
|
||||
|
||||
22 Mar 2019
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a654edd..f8cdb32 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -277,6 +277,7 @@ AC_CHECK_FUNCS(m4_normalize([
|
||||
statfs64
|
||||
statvfs
|
||||
statvfs64
|
||||
+ statx
|
||||
stpcpy
|
||||
strchrnul
|
||||
strlcpy
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index d729b0e..6066345 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -152,6 +152,7 @@ libfakechroot_la_SOURCES = \
|
||||
statfs64.c \
|
||||
statvfs.c \
|
||||
statvfs64.c \
|
||||
+ statx.c \
|
||||
stpcpy.c \
|
||||
strchrnul.c \
|
||||
strchrnul.h \
|
||||
diff --git a/src/statx.c b/src/statx.c
|
||||
new file mode 100644
|
||||
index 0000000..524f73e
|
||||
--- /dev/null
|
||||
+++ b/src/statx.c
|
||||
@@ -0,0 +1,44 @@
|
||||
+/*
|
||||
+ libfakechroot -- fake chroot environment
|
||||
+ Copyright (c) 2010-2020 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_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
|
||||
|
|
@ -0,0 +1 @@
|
|||
epel8-playground decommissioned : https://pagure.io/epel/issue/136
|
||||
248
fakechroot.spec
248
fakechroot.spec
|
|
@ -1,248 +0,0 @@
|
|||
Name: fakechroot
|
||||
Version: 2.20.1
|
||||
Release: 11%{?dist}
|
||||
Summary: Gives a fake chroot environment
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/dex4er/fakechroot
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch1: https://github.com/dex4er/fakechroot/commit/b42d1fb9538f680af2f31e864c555414ccba842a.patch
|
||||
Patch2: https://github.com/dex4er/fakechroot/pull/85/commits/534e6d555736b97211523970d378dfb0db2608e9.patch
|
||||
Patch3: https://github.com/dex4er/fakechroot/pull/85/commits/75d7e6fa191c11a791faff06a0de86eaa7801d05.patch
|
||||
Patch4: https://github.com/dex4er/fakechroot/pull/85/commits/693a3597ea7fccfb62f357503ff177bd3e3d5a89.patch
|
||||
Patch5: https://github.com/dex4er/fakechroot/pull/86.patch
|
||||
Patch6: fix_test_on_32bits.patch
|
||||
|
||||
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
# Required for manpage
|
||||
BuildRequires: /usr/bin/pod2man
|
||||
BuildRequires: gdbm-libs
|
||||
# ldd.fakechroot
|
||||
Requires: /usr/bin/objdump
|
||||
|
||||
%description
|
||||
fakechroot runs a command in an environment were is additionally
|
||||
possible to use the chroot(8) call without root privileges. This is
|
||||
useful for allowing users to create their own chrooted environment
|
||||
with possibility to install another packages without need for root
|
||||
privileges.
|
||||
|
||||
%package libs
|
||||
Summary: Libraries of %{name}
|
||||
|
||||
%description libs
|
||||
This package contains the libraries required by %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
# For %%doc dependency-clean.
|
||||
chmod -x scripts/{relocatesymlinks,restoremode,savemode}.sh
|
||||
|
||||
#rm test/t/escape-nested-chroot.t
|
||||
|
||||
%build
|
||||
autoreconf -vfi
|
||||
|
||||
%if 0%{?__isa_bits} == 64
|
||||
%configure --disable-static --disable-silent-rules --with-libpath="%{_libdir}/fakechroot:/usr/lib/fakechroot"
|
||||
%else
|
||||
%configure --disable-static --disable-silent-rules --with-libpath="%{_libdir}/fakechroot:/usr/lib64/fakechroot"
|
||||
%endif
|
||||
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
# Drop libtool files
|
||||
find %{buildroot}%{_libdir} -name '*.la' -delete -print
|
||||
|
||||
%check
|
||||
%make_build check
|
||||
|
||||
%files
|
||||
%doc scripts/{relocatesymlinks,restoremode,savemode}.sh
|
||||
%doc NEWS.md README.md THANKS.md
|
||||
%license COPYING LICENSE
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/env.%{name}
|
||||
%{_bindir}/ldd.%{name}
|
||||
%{_sbindir}/chroot.%{name}
|
||||
%dir %{_sysconfdir}/%{name}/
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/chroot.env
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/debootstrap.env
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/rinse.env
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
|
||||
%files libs
|
||||
%{_libdir}/%{name}/
|
||||
|
||||
%changelog
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
- Fix build with https://github.com/dex4er/fakechroot/pull/85 and
|
||||
https://github.com/dex4er/fakechroot/pull/86
|
||||
|
||||
* Sat Aug 29 2020 Sérgio Basto <sergio@serjux.com> - 2.20.1-7
|
||||
- Use upstream fix for t/escape-nested-chroot.t
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-6
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
- Disable escape-nested-chroot test temporarily
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Feb 12 2020 Sérgio Basto <sergio@serjux.com> - 2.20.1-4
|
||||
- Use if "%{_libdir}" == "/usr/lib64" instead %if 0%{__isa_bits} == 64
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jan 24 2020 Sérgio Basto <sergio@serjux.com> - 2.20.1-2
|
||||
- (#1241555) fakechroot isn't multilib
|
||||
|
||||
* Fri Oct 18 2019 Sérgio Basto <sergio@serjux.com> - 2.20.1-1
|
||||
- Update to 2.20.1 (#1689666)
|
||||
- Drop upstreamed patch
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Aug 21 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.19-4
|
||||
- Add support for LFS
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Feb 07 2017 Sérgio Basto <sergio@serjux.com> - 2.19-1
|
||||
- Update fakechroot to 2.19 (#1396855)
|
||||
|
||||
* Wed May 18 2016 Igor Gnatenko <ignatenko@redhat.com> - 2.18-1
|
||||
- Update to 2.18
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.17.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Mar 02 2015 Christopher Meng <rpm@cicku.me> - 2.17.2-1
|
||||
- Update to 2.17.2
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Mon Feb 25 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.9-29
|
||||
- Add BR: /usr/bin/pod2man (Fix FTBFS #913997).
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Jun 12 2009 Richard W.M. Jones <rjones@redhat.com> - 2.9-23
|
||||
- Added patch to remove test for specific version of automake.
|
||||
|
||||
* Sat Apr 18 2009 Richard W.M. Jones <rjones@redhat.com> - 2.9-22
|
||||
- FAKECHROOT_CMD_SUBST patch has now been accepted upstream.
|
||||
|
||||
* Tue Apr 14 2009 Richard W.M. Jones <rjones@redhat.com> - 2.9-20
|
||||
- Add fakechroot-scandir.patch to fix builds on Rawhide.
|
||||
|
||||
* Tue Apr 14 2009 Axel Thimm <Axel.Thimm@ATrpms.net> - 2.9-19
|
||||
- Update to 2.9.
|
||||
- Removed fakechroot-2.8-initsocketlen.patch (upstream now).
|
||||
- Removed int->ssize_t readlink type change (upstream testing for type
|
||||
now).
|
||||
- Removed permission fix for scripts/ldd.fake scripts/restoremode.sh
|
||||
scripts/savemode.sh (fixed upstream).
|
||||
|
||||
* Wed Mar 18 2009 Richard W.M. Jones <rjones@redhat.com> - 2.8-18
|
||||
- Create a fakeroot-libs subpackage so that the package is multilib aware.
|
||||
|
||||
* Thu Jan 15 2009 Rakesh Pandit <rakesh@fedoraproject.org> 2.8-16
|
||||
- Fixed URL
|
||||
|
||||
* Sun Oct 5 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 2.8-15
|
||||
- Fix getpeername/getsockname socklen initialization.
|
||||
|
||||
* Sun Aug 24 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 2.8-14
|
||||
- %%check || : does not work anymore.
|
||||
|
||||
* Sun Aug 3 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 2.8-13
|
||||
- Update to 2.8.
|
||||
|
||||
* Mon Jan 1 2007 Axel Thimm <Axel.Thimm@ATrpms.net> - 2.5-12
|
||||
- Remove executable bits from scripts in documentation.
|
||||
|
||||
* Sun Dec 31 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 2.5-11
|
||||
- Add %%{_libdir}/fakechroot to %%files.
|
||||
- Fix license (is LGPL, not GPL).
|
||||
- Add commented %%check (currently broken).
|
||||
- Add ldd.fake and save/restoremode.sh to %%doc
|
||||
|
||||
* Fri Dec 29 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 2.5-10
|
||||
- Extend the %%description a bit.
|
||||
|
||||
* Thu Dec 28 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 2.5-9
|
||||
- Don't build static lib.
|
||||
- Exclude libtool lib.
|
||||
|
||||
* Thu Nov 24 2005 Axel Thimm <Axel.Thimm@ATrpms.net>
|
||||
- Update to 2.5.
|
||||
|
||||
* Sat Sep 17 2005 Axel Thimm <Axel.Thimm@ATrpms.net>
|
||||
- Update to 2.4.
|
||||
|
||||
* Sun Jul 3 2005 Axel Thimm <Axel.Thimm@ATrpms.net>
|
||||
- Update to 0.9+1.3.
|
||||
|
||||
* Sun Feb 6 2005 Axel Thimm <Axel.Thimm@ATrpms.net>
|
||||
- Update to 0.5+1.2.4.
|
||||
|
||||
* Sun Jan 25 2004 Axel Thimm <Axel.Thimm@ATrpms.net>
|
||||
- Initial build.
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
removing leading / for some reason cp doesn't like it
|
||||
--- fakechroot-2.20.1/test/t/cp.t 2019-03-22 21:02:42.000000000 +0000
|
||||
+++ fakechroot-2.20.1/test/t/cp.t 2022-03-04 02:07:11.511455404 +0000
|
||||
@@ -19,13 +19,13 @@ for chroot in chroot fakechroot; do
|
||||
else
|
||||
|
||||
echo 'something' > $testtree/file-$chroot
|
||||
- ln -s /file-$chroot $testtree/symlink-$chroot
|
||||
+ ln -s file-$chroot $testtree/symlink-$chroot
|
||||
|
||||
- t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS /file-$chroot /file2-$chroot; cat /file2-$chroot" 2>&1`
|
||||
+ t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS file-$chroot file2-$chroot; cat /file2-$chroot" 2>&1`
|
||||
test "$t" = "something" || not
|
||||
- ok "$chroot cp $CP_ARGS /file-$chroot /file2-$chroot:" $t
|
||||
+ ok "$chroot cp $CP_ARGS file-$chroot file2-$chroot:" $t
|
||||
|
||||
- t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS /symlink-$chroot /symlink2-$chroot; cat /symlink2-$chroot" 2>&1`
|
||||
+ t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS symlink-$chroot symlink2-$chroot; cat /symlink2-$chroot" 2>&1`
|
||||
test "$t" = "something" || not
|
||||
ok "$chroot cp $CP_ARGS /symlink-$chroot /symlink2-$chroot:" $t
|
||||
|
||||
Loading…
Reference in New Issue