From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Lucas Stach <l.stach@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] host-fakeroot: version bump 1.25.1 -> 1.25.3
Date: Thu, 27 May 2021 08:45:26 +0200 [thread overview]
Message-ID: <20210527064526.4039633-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210503103743.31995-4-l.stach@pengutronix.de>
Thanks, applied as d02f4bdebe27800d279507cc5f1defb2a8ad1a49.
Michael
[sent from post-receive hook]
On Thu, 27 May 2021 08:45:25 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> - version bump
> - use new snapshot address
> - pull in upstream fixes from https://salsa.debian.org/clint/fakeroot
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20210503103743.31995-4-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/fakeroot-1.25.1/series b/patches/fakeroot-1.25.1/series
> deleted file mode 100644
> index 60dad17f9d31..000000000000
> --- a/patches/fakeroot-1.25.1/series
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -#tag:debian --start-number 1
> -0001-eglibc-fts-without-LFS.patch
> -#tag:ptxdist --start-number 100
> -0100-make-fakeroot-relocatable.patch
> -# e69f7ec6ca564a31bcbb10ed0dcc2fa2 - git-ptx-patches magic
> diff --git a/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch b/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
> new file mode 100644
> index 000000000000..92584801dc10
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
> @@ -0,0 +1,33 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Thu, 11 Feb 2021 20:59:25 -0800
> +Subject: [PATCH] libfakeroot.c: define _STAT_VER if not already defined
> +
> +Based on patch from Jan Pazdziora:
> +https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + libfakeroot.c | 10 ++++++++++
> + 1 file changed, 10 insertions(+)
> +
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index 3e80e38b16db..14cdbc4dca12 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -90,6 +90,16 @@
> + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
> + #endif
> +
> ++#ifndef _STAT_VER
> ++ #if defined (__aarch64__)
> ++ #define _STAT_VER 0
> ++ #elif defined (__x86_64__)
> ++ #define _STAT_VER 1
> ++ #else
> ++ #define _STAT_VER 3
> ++ #endif
> ++#endif
> ++
> + /*
> + These INT_* (which stands for internal) macros should always be used when
> + the fakeroot library owns the storage of the stat variable.
> diff --git a/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch b/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
> new file mode 100644
> index 000000000000..59bc951d3c55
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
> @@ -0,0 +1,68 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Thu, 11 Feb 2021 21:00:04 -0800
> +Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
> + 1 file changed, 48 insertions(+)
> +
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index 14cdbc4dca12..d75c51fa990a 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath,
> + #endif /* HAVE_FSTATAT */
> +
> +
> ++#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33)
> ++/* Glibc 2.33 exports symbols for these functions in the shared lib */
> ++ int lstat(const char *file_name, struct stat *statbuf) {
> ++ return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf);
> ++ }
> ++ int stat(const char *file_name, struct stat *st) {
> ++ return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st);
> ++ }
> ++ int fstat(int fd, struct stat *st) {
> ++ return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st);
> ++ }
> ++
> ++ #ifdef HAVE_FSTATAT
> ++ int fstatat(int dir_fd, const char *path, struct stat *st, int flags) {
> ++ return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags);
> ++ }
> ++ #endif
> ++
> ++ #ifdef STAT64_SUPPORT
> ++ int lstat64(const char *file_name, struct stat64 *st) {
> ++ return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st);
> ++ }
> ++ int stat64(const char *file_name, struct stat64 *st) {
> ++ return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st);
> ++ }
> ++ int fstat64(int fd, struct stat64 *st) {
> ++ return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st);
> ++ }
> ++
> ++ #ifdef HAVE_FSTATAT
> ++ int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) {
> ++ return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags);
> ++ }
> ++ #endif
> ++ #endif
> ++
> ++ int mknod(const char *pathname, mode_t mode, dev_t dev) {
> ++ return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev);
> ++ }
> ++
> ++ #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT)
> ++ int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) {
> ++ return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev);
> ++ }
> ++ #endif
> ++#endif /* GLIBC_PREREQ */
> ++
> ++
> + #ifdef FAKEROOT_FAKENET
> + pid_t fork(void)
> + {
> diff --git a/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch b/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
> new file mode 100644
> index 000000000000..8007d73343e5
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
> @@ -0,0 +1,22 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Thu, 11 Feb 2021 21:00:20 -0800
> +Subject: [PATCH] libfakeroot.c: fix compile error with DEBUG enabled
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + libfakeroot.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index d75c51fa990a..31480f8323ba 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -2525,7 +2525,7 @@ int statx (int dirfd, const char *path, int flags, unsigned int mask, struct sta
> +
> + #ifdef LIBFAKEROOT_DEBUGGING
> + if (fakeroot_debug) {
> +- fprintf(stderr, "statx fd %d\n", fd);
> ++ fprintf(stderr, "statx fd %d\n", dirfd);
> + }
> + #endif /* LIBFAKEROOT_DEBUGGING */
> + r=INT_NEXT_FSTATAT(dirfd, path, &st, flags);
> diff --git a/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch b/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
> new file mode 100644
> index 000000000000..5291625eea1f
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
> @@ -0,0 +1,56 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Sat, 13 Feb 2021 19:32:08 -0800
> +Subject: [PATCH] configure.ac: fix __xmknod{,at} pointer argument
> +
> +Switch default to assume * and not the absence of *.
> +
> +On glibc 2.33+, there is no definition for these functions in header
> +files, so the compile test doesn't work. But, we can default to using
> +the pointer (as is the case with newer glibc), and use the header file
> +on older platforms to fail the test and use no pointer.
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + configure.ac | 16 ++++++++--------
> + 1 file changed, 8 insertions(+), 8 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 73415d2a91a6..d85566f089b4 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod])
> + ]], [[
> + int __xmknod ( int ver,
> + const char *pathname ,
> +- mode_t mode , dev_t dev);
> ++ mode_t mode , dev_t *dev);
> + ]])],[
> +- AC_DEFINE(XMKNOD_FRTH_ARG,)
> +- AC_MSG_RESULT([no extra *])
> +- ],[
> + AC_DEFINE(XMKNOD_FRTH_ARG,[*])
> + AC_MSG_RESULT([needs *])
> ++ ],[
> ++ AC_DEFINE(XMKNOD_FRTH_ARG,)
> ++ AC_MSG_RESULT([no extra *])
> +
> + ])
> +
> +@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat])
> + int __xmknodat ( int ver,
> + int dirfd,
> + const char *pathname ,
> +- mode_t mode , dev_t dev);
> ++ mode_t mode , dev_t *dev);
> + ]])],[
> +- AC_DEFINE(XMKNODAT_FIFTH_ARG,)
> +- AC_MSG_RESULT([no extra *])
> +- ],[
> + AC_DEFINE(XMKNODAT_FIFTH_ARG,[*])
> + AC_MSG_RESULT([needs *])
> ++ ],[
> ++ AC_DEFINE(XMKNODAT_FIFTH_ARG,)
> ++ AC_MSG_RESULT([no extra *])
> +
> + ])
> +
> diff --git a/patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch b/patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
> similarity index 56%
> rename from patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch
> rename to patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
> index dca76eff7c91..620afc2ea476 100644
> --- a/patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch
> +++ b/patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
> @@ -1,19 +1,24 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Wed, 23 Sep 2020 09:21:09 +0200
> -Subject: [PATCH] eglibc-fts-without-LFS
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Sat, 13 Feb 2021 19:35:31 -0800
> +Subject: [PATCH] libfakeroot.c: fix fts_read and fts_children
>
> -Imported from fakeroot_1.25.1-1.debian.tar.xz
> +Apply Debian patch from [0], since glibc is usually built without LFS.
> +__USE_LARGEFILE64 and FTSENT64 should be used anyway for proper support
> +of this, if needed. See [1] for more details.
>
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> +[0]: https://sources.debian.org/patches/fakeroot/1.25.3-1.1/eglibc-fts-without-LFS/
> +[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676428
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> ---
> libfakeroot.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/libfakeroot.c b/libfakeroot.c
> -index 01de9da25c39..badb7235a166 100644
> +index 31480f8323ba..169f4da4de21 100644
> --- a/libfakeroot.c
> +++ b/libfakeroot.c
> -@@ -2006,11 +2006,7 @@ FTSENT *fts_read(FTS *ftsp) {
> +@@ -2066,11 +2066,7 @@ FTSENT *fts_read(FTS *ftsp) {
> || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK))
> r->fts_statp = NULL; /* Otherwise fts_statp may be a random pointer */
> if(r && r->fts_statp) { /* Should we bother checking fts_info here? */
> @@ -25,7 +30,7 @@ index 01de9da25c39..badb7235a166 100644
> }
>
> return r;
> -@@ -2029,11 +2025,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
> +@@ -2089,11 +2085,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
> first=next_fts_children(ftsp, options);
> for(r = first; r; r = r->fts_link) {
> if(r && r->fts_statp) { /* Should we bother checking fts_info here? */
> diff --git a/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch b/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
> new file mode 100644
> index 000000000000..5db58dcd3ede
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
> @@ -0,0 +1,26 @@
> +From: Dimitri John Ledkov <xnox@ubuntu.com>
> +Date: Wed, 17 Feb 2021 14:41:43 +0000
> +Subject: [PATCH] Add _STAT_VER defines for ppc64le, riscv64, s390x.
> +
> +Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
> +---
> + libfakeroot.c | 6 ++++++
> + 1 file changed, 6 insertions(+)
> +
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index 169f4da4de21..74f52ab1df79 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -93,6 +93,12 @@
> + #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
> diff --git a/patches/fakeroot-1.25.3/0007-OS-X-portability.patch b/patches/fakeroot-1.25.3/0007-OS-X-portability.patch
> new file mode 100644
> index 000000000000..768696a25953
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0007-OS-X-portability.patch
> @@ -0,0 +1,161 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Sat, 13 Feb 2021 20:05:17 -0800
> +Subject: [PATCH] OS X portability
> +
> +OS X portability work from OpenWrt.
> +
> +Cc: Felix Fietkau <nbd@nbd.name>
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + configure.ac | 1 +
> + libfakeroot.c | 36 ++++++++++++++++++++++++++++++++++--
> + wrapawk_macosx | 10 +++++++---
> + wrapfunc.inp | 4 ++--
> + 4 files changed, 44 insertions(+), 7 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index d85566f089b4..35f9ecf28993 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -146,6 +146,7 @@ for first in size_t int; do
> + #include <sys/types.h>
> + #endif
> + #include <unistd.h>
> ++#include <stdio.h>
> + #ifdef HAVE_GRP_H
> + #include <grp.h>
> + #endif
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index 74f52ab1df79..f9ca1820e4b7 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -128,8 +128,16 @@
> + #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER)
> + #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER)
> + #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b)
> ++
> ++/* 10.10 uses id_t in getpriority/setpriority calls, so pretend
> ++ id_t is used everywhere, just happens to be int on some OSes */
> ++#ifndef _ID_T
> ++#define _ID_T
> ++typedef int id_t;
> ++#endif
> + #endif
> +
> ++#include <sys/types.h>
> + #include <stdlib.h>
> + #include <sys/ipc.h>
> + #include <sys/msg.h>
> +@@ -141,7 +149,6 @@
> + #include <unistd.h>
> + #include <dirent.h>
> + #include <errno.h>
> +-#include <sys/types.h>
> + #ifdef HAVE_SYS_ACL_H
> + #include <sys/acl.h>
> + #endif /* HAVE_SYS_ACL_H */
> +@@ -204,6 +211,15 @@ extern int unsetenv (const char *name);
> + #undef __lxstat64
> + #undef _FILE_OFFSET_BITS
> +
> ++
> ++#ifndef AT_EMPTY_PATH
> ++#define AT_EMPTY_PATH 0
> ++#endif
> ++
> ++#ifndef AT_NO_AUTOMOUNT
> ++#define AT_NO_AUTOMOUNT 0
> ++#endif
> ++
> + /*
> + // next_wrap_st:
> + // this structure is used in next_wrap, which is defined in
> +@@ -1975,7 +1991,7 @@ ssize_t fremovexattr(int fd, const char *name)
> + }
> + #endif /* HAVE_FREMOVEXATTR */
> +
> +-int setpriority(int which, int who, int prio){
> ++int setpriority(int which, id_t who, int prio){
> + if (fakeroot_disabled)
> + return next_setpriority(which, who, prio);
> + next_setpriority(which, who, prio);
> +@@ -2576,3 +2592,19 @@ int sysinfo(int command, char *buf, long count)
> + }
> + }
> + #endif
> ++
> ++#ifdef HAVE_OPENAT
> ++int openat(int dir_fd, const char *pathname, int flags, ...)
> ++{
> ++ mode_t mode;
> ++
> ++ if (flags & O_CREAT) {
> ++ va_list args;
> ++ va_start(args, flags);
> ++ mode = va_arg(args, int);
> ++ va_end(args);
> ++ }
> ++
> ++ return next_openat(dir_fd, pathname, flags, mode);
> ++}
> ++#endif
> +diff --git a/wrapawk_macosx b/wrapawk_macosx
> +index 088a7f48de49..f783219758ac 100644
> +--- a/wrapawk_macosx
> ++++ b/wrapawk_macosx
> +@@ -46,26 +46,30 @@ BEGIN{
> + argtype=$3;
> + argname=$4;
> + MACRO=$5;
> ++ argtype_def=$6
> ++ if(!argtype_def) {
> ++ argtype_def = argtype
> ++ }
> + if(MACRO){
> + print "extern " ret " MY_DEF(" name ")" argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
> + print "INTERPOSE(MY_DEF(" name "_RAW)," name "_RAW);" > structfile;
> + print "#undef " name > deffile
> + print "#define " name " MY_DEF(" name "_RAW)" > deffile
> +
> +- print "extern " ret, name, argtype ";" > tmpffile;
> ++ print "extern " ret, name, argtype_def ";" > tmpffile;
> + print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " __attribute__((always_inline));" > tmpffile;
> + print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " {" > tmpffile;
> + print " return " name, argname ";" > tmpffile;
> + print "}" > tmpffile;
> + print "" > tmpffile;
> + } else {
> +- print "extern " ret " my_" name, argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
> ++ print "extern " ret " my_" name, argtype_def " __attribute__((visibility(\"hidden\")));" > headerfile;
> + print "#undef " name > structfile;
> + print "INTERPOSE(my_" name "," name ");" > structfile;
> + print "#define " name " my_" name > structfile
> + print "#define " name " my_" name > deffile
> +
> +- print "extern " ret, name, argtype ";" > tmpffile;
> ++ print "extern " ret, name, argtype_def ";" > tmpffile;
> + if(argname){
> + print "static __inline__ " ret " next_" name, argtype " __attribute__((always_inline));" > tmpffile;
> + print "static __inline__ " ret " next_" name, argtype " {" > tmpffile;
> +diff --git a/wrapfunc.inp b/wrapfunc.inp
> +index f7ad1867891a..556af34579b0 100644
> +--- a/wrapfunc.inp
> ++++ b/wrapfunc.inp
> +@@ -146,7 +146,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid)
> + initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group)
> + getgroups;int;(int size, gid_t list[]);(size, list)
> + setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list)
> +-setpriority;int;(int which, int who, int prio);(which, who, prio)
> ++setpriority;int;(int which, id_t who, int prio);(which, who, prio)
> + #ifdef HAVE_CAPSET
> + capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap)
> + #endif /* HAVE_CAPSET */
> +@@ -198,7 +198,7 @@ fchownat;int;(int dir_fd, const char *path, uid_t owner, gid_t group, int flags)
> + mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode)
> + #endif /* HAVE_MKDIRAT */
> + #ifdef HAVE_OPENAT
> +-openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags)
> ++openat;int;(int dir_fd, const char *pathname, int flags, mode_t mode);(dir_fd, pathname, flags, mode);;(int dir_fd, const char *pathname, int flags, ...)
> + #endif /* HAVE_OPENAT */
> + #ifdef HAVE_RENAMEAT
> + renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath)
> diff --git a/patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch b/patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
> similarity index 96%
> rename from patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch
> rename to patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
> index 9d203b4c1100..8d7a6994cf9c 100644
> --- a/patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch
> +++ b/patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
> @@ -12,7 +12,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
> -index 0f6bf66088a5..bedf9aeb39c2 100755
> +index 0d6f435af1ed..08d8b27863a8 100755
> --- a/scripts/fakeroot.in
> +++ b/scripts/fakeroot.in
> @@ -30,12 +30,12 @@ fatal ()
> diff --git a/patches/fakeroot-1.25.1/autogen.sh b/patches/fakeroot-1.25.3/autogen.sh
> similarity index 100%
> rename from patches/fakeroot-1.25.1/autogen.sh
> rename to patches/fakeroot-1.25.3/autogen.sh
> diff --git a/patches/fakeroot-1.25.3/series b/patches/fakeroot-1.25.3/series
> new file mode 100644
> index 000000000000..fa00105832e5
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/series
> @@ -0,0 +1,13 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +#tag:upstream --start-number 1
> +0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
> +0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
> +0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
> +0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
> +0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
> +0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
> +0007-OS-X-portability.patch
> +#tag:ptxdist --start-number 100
> +0008-make-fakeroot-relocatable.patch
> +# d07e91409b4dcfb1e6e2abd76ddc7481 - git-ptx-patches magic
> diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make
> index 27b0d01f5260..3a09e4ce84a2 100644
> --- a/rules/host-fakeroot.make
> +++ b/rules/host-fakeroot.make
> @@ -15,12 +15,12 @@ HOST_PACKAGES-$(PTXCONF_HOST_FAKEROOT) += host-fakeroot
> #
> # Paths and names
> #
> -HOST_FAKEROOT_VERSION := 1.25.1
> -HOST_FAKEROOT_MD5 := 48b92ef9772b2ec088120c845e1edbd0
> +HOST_FAKEROOT_VERSION := 1.25.3
> +HOST_FAKEROOT_MD5 := f6104ef6960c962377ef062bf222a1d2
> HOST_FAKEROOT_SUFFIX := tar.gz
> HOST_FAKEROOT := fakeroot-$(HOST_FAKEROOT_VERSION)
> HOST_FAKEROOT_TARBALL := fakeroot_$(HOST_FAKEROOT_VERSION).orig.$(HOST_FAKEROOT_SUFFIX)
> -HOST_FAKEROOT_URL := https://snapshot.debian.org/archive/debian/20200923T030305Z/pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL)
> +HOST_FAKEROOT_URL := https://snapshot.debian.org/archive/debian/20210123T025406Z/pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL)
> HOST_FAKEROOT_SOURCE := $(SRCDIR)/$(HOST_FAKEROOT_TARBALL)
> HOST_FAKEROOT_DIR := $(HOST_BUILDDIR)/$(HOST_FAKEROOT)
> HOST_FAKEROOT_LICENSE := GPL-3.0-or-later
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-05-27 6:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 10:37 [ptxdist] [PATCH v2 1/5] dtc: fix build with GCC11 Lucas Stach
2021-05-03 10:37 ` [ptxdist] [PATCH v2 2/5] nspr: version bump 4.26 -> 4.30 Lucas Stach
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-03 10:37 ` [ptxdist] [PATCH v2 3/5] host-nss: disable array-parameter warning Lucas Stach
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-03 10:37 ` [ptxdist] [PATCH v2 4/5] host-fakeroot: version bump 1.25.1 -> 1.25.3 Lucas Stach
2021-05-27 6:45 ` Michael Olbrich [this message]
2021-05-03 10:37 ` [ptxdist] [PATCH v2 5/5] qt5: fix build with GCC11 Lucas Stach
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-27 6:45 ` [ptxdist] [APPLIED] dtc: " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210527064526.4039633-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox