Merge branch 'f30' into f31

.gitignore

@@ -3,3 +3,4 @@
 /fakeroot_1.21.orig.tar.gz
 /fakeroot_1.22.orig.tar.bz2
 /fakeroot_1.23.orig.tar.xz
+/fakeroot_1.24.orig.tar.gz

debian_glibc-xattr-types.patch

@@ -1,108 +0,0 @@
-Fix the type of xattr functions to match the glibc headers.
-
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -1570,7 +1570,7 @@
- #endif /* HAVE_CAPSET */
- 
- #if defined(HAVE_SETXATTR) || defined(HAVE_LSETXATTR) || defined(HAVE_FSETXATTR)
--static size_t common_setxattr(INT_STRUCT_STAT *st, const char *name, void * value, size_t size, int flags)
-+static int common_setxattr(INT_STRUCT_STAT *st, const char *name, const void * value, size_t size, int flags)
- {
-   xattr_args xattr;
-   xattr.name = name;
-@@ -1625,7 +1625,7 @@
- #endif /* defined(HAVE_LISTXATTR) || defined(HAVE_LLISTXATTR) || defined(HAVE_FLISTXATTR) */
- 
- #if defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR)
--static size_t common_removexattr(INT_STRUCT_STAT *st, const char *name)
-+static int common_removexattr(INT_STRUCT_STAT *st, const char *name)
- {
-   xattr_args xattr;
-   xattr.name = name;
-@@ -1643,7 +1643,7 @@
- #endif /* defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) */
- 
- #ifdef HAVE_SETXATTR
--ssize_t setxattr(const char *path, const char *name, void *value, size_t size, int flags)
-+int setxattr(const char *path, const char *name, const void *value, size_t size, int flags)
- {
-   INT_STRUCT_STAT st;
-   int r;
-@@ -1664,7 +1664,7 @@
- #endif /* HAVE_SETXATTR */
- 
- #ifdef HAVE_LSETXATTR
--ssize_t lsetxattr(const char *path, const char *name, void *value, size_t size, int flags)
-+int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
- {
-   INT_STRUCT_STAT st;
-   int r;
-@@ -1685,7 +1685,7 @@
- #endif /* HAVE_LSETXATTR */
- 
- #ifdef HAVE_FSETXATTR
--ssize_t fsetxattr(int fd, const char *name, void *value, size_t size, int flags)
-+int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags)
- {
-   INT_STRUCT_STAT st;
-   int r;
-@@ -1832,7 +1832,7 @@
- #endif /* HAVE_FLISTXATTR */
- 
- #ifdef HAVE_REMOVEXATTR
--ssize_t removexattr(const char *path, const char *name)
-+int removexattr(const char *path, const char *name)
- {
-   INT_STRUCT_STAT st;
-   int r;
-@@ -1853,7 +1853,7 @@
- #endif /* HAVE_REMOVEXATTR */
- 
- #ifdef HAVE_LREMOVEXATTR
--ssize_t lremovexattr(const char *path, const char *name)
-+int lremovexattr(const char *path, const char *name)
- {
-   INT_STRUCT_STAT st;
-   int r;
-@@ -1874,7 +1874,7 @@
- #endif /* HAVE_LREMOVEXATTR */
- 
- #ifdef HAVE_FREMOVEXATTR
--ssize_t fremovexattr(int fd, const char *name)
-+int fremovexattr(int fd, const char *name)
- {
-   INT_STRUCT_STAT st;
-   int r;
---- a/wrapfunc.inp
-+++ b/wrapfunc.inp
-@@ -168,22 +168,22 @@
- fgetxattr;ssize_t;(int fd, const char *name, void *value, size_t size);(fd, name, value, size)
- #endif /* HAVE_FGETXATTR */
- #ifdef HAVE_SETXATTR
--setxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags)
-+setxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags)
- #endif /* HAVE_SETXATTR */
- #ifdef HAVE_LSETXATTR
--lsetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags)
-+lsetxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags)
- #endif /* HAVE_LSETXATTR */
- #ifdef HAVE_FSETXATTR
--fsetxattr;ssize_t;(int fd, const char *name, void *value, size_t size, int flags);(fd, name, value, size, flags)
-+fsetxattr;int;(int fd, const char *name, const void *value, size_t size, int flags);(fd, name, value, size, flags)
- #endif /* HAVE_FSETXATTR */
- #ifdef HAVE_REMOVEXATTR
--removexattr;ssize_t;(const char *path, const char *name);(path, name)
-+removexattr;int;(const char *path, const char *name);(path, name)
- #endif /* HAVE_REMOVEXATTR */
- #ifdef HAVE_LREMOVEXATTR
--lremovexattr;ssize_t;(const char *path, const char *name);(path, name)
-+lremovexattr;int;(const char *path, const char *name);(path, name)
- #endif /* HAVE_LREMOVEXATTR */
- #ifdef HAVE_FREMOVEXATTR
--fremovexattr;ssize_t;(int fd, const char *name);(fd, name)
-+fremovexattr;int;(int fd, const char *name);(fd, name)
- #endif /* HAVE_FREMOVEXATTR */
- 
- #ifdef HAVE_FSTATAT
-

fakeroot-tests.patch

@@ -1,12 +0,0 @@
-diff -up fakeroot-1.23/test/tartest.tests fakeroot-1.23/test/tartest
---- fakeroot-1.23/test/tartest.tests	2018-07-16 11:23:37.524589359 +0200
-+++ fakeroot-1.23/test/tartest	2018-07-16 11:33:46.051167023 +0200
-@@ -79,7 +79,7 @@ uudecode ${SRCDIR}/tartest.tar.gz.uue
- 
- tar -cf - tar | gzip -9 > faketar.tar.gz
- 
--${SRCDIR}/compare-tar tartest.tar.gz faketar.tar.gz
-+${SRCDIR}/compare-tar tartest.tar.gz faketar.tar.gz || :
- 
- #test 2: try to unpack, pack the tar archive, and
- #        see if the result is the same archive

fakeroot.spec

@@ -2,18 +2,17 @@
 
 Summary: Gives a fake root environment
 Name: fakeroot
-Version: 1.23
-Release: 4%{?dist}
+Version: 1.24
+Release: 1%{?dist}
 # setenv.c: LGPLv2+
 # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic)
 # the rest: GPLv3+
 License: GPLv3+ and LGPLv2+ and (GPL+ or Artistic)
 URL: https://tracker.debian.org/pkg/fakeroot
-Source0: http://http.debian.net/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.xz
+Source0: https://cdn-aws.deb.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.gz
 
 # Debian package patches, from debian.tar.xz
 Patch0: debian_eglibc-fts-without-LFS.patch
-Patch1: debian_glibc-xattr-types.patch
 Patch2: debian_fix-shell-in-fakeroot.patch
 Patch3: debian_hide-dlsym-error.patch
 # Address some POSIX-types related problems.
@@ -197,6 +196,11 @@ fi
 %ghost %{_libdir}/libfakeroot/libfakeroot-0.so
 
 %changelog
+* Fri Sep 20 2019 Dominik Mierzejewski <rpm@greysector.net> - 1.24-1
+- update to 1.24 (#1750054)
+- update source URL
+- drop obsolete patches
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.23-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (fakeroot_1.23.orig.tar.xz) = 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
+SHA512 (fakeroot_1.24.orig.tar.gz) = b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487