new upstream release - 2.5.0

This commit is contained in:
Kamil Dudka 2021-03-12 09:07:51 +01:00
commit 1fcc01bebc
7 changed files with 23 additions and 162 deletions

2
.gitignore vendored
View file

@ -1 +1 @@
/attr-2.4.*.tar.gz
/attr-2.[45].*.tar.gz

View file

@ -1,29 +0,0 @@
From 46baedf88fe22abafa3f2341b2c1bcb4764ce389 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Fri, 21 Jul 2017 14:05:47 -0700
Subject: [PATCH] attr: escape left brace in a regex in test/run
... to fix test-suite failure with perl-5.26.0
Bug: https://bugzilla.redhat.com/1473853
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
test/run | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/run b/test/run
index 4b1f8d0..07e916c 100755
--- a/test/run
+++ b/test/run
@@ -106,7 +106,7 @@ for (;;) {
if (defined $line) {
# Substitute %VAR and %{VAR} with environment variables.
$line =~ s[%(\w+)][$ENV{$1}]eg;
- $line =~ s[%{(\w+)}][$ENV{$1}]eg;
+ $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
}
if (defined $line) {
if ($line =~ s/^\s*< ?//) {
--
2.13.0

View file

@ -1,123 +0,0 @@
From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Fri, 17 Aug 2018 14:07:31 +0200
Subject: [PATCH] Switch back to syscall()
Switch back to syscall() for the *xattr system calls. The current
mechanism of forwarding those calls to glibc breaks libraries like
libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc
-fsanitize=address).
Those libraries provide wrappers for functions defined in other shared
libraries, usually glibc, do their own processing, and forward calls to
the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name"). In
our case, dlsym returns the libattr_*xattr wrappers. However, when our
wrappers try calling glibc, they end up calling the libfakeroot /
libasan wrappers instead because those override the original symbols =>
recursion.
The libattr_*xattr wrappers will only be used when symbols are looked up
at runtime (dlopen / dlsym). Programs linking against libattr will
directly use the glibc provided symbols. Therefore, the slightly worse
performance of syscall() won't affect any of the "normal" users of
libattr.
---
libattr/syscalls.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/libattr/syscalls.c b/libattr/syscalls.c
index 3013aa0bb687..721ad7f33185 100644
--- a/libattr/syscalls.c
+++ b/libattr/syscalls.c
@@ -22,6 +22,8 @@
#include "config.h"
+#include <unistd.h>
+#include <sys/syscall.h>
#include <sys/xattr.h>
#ifdef HAVE_VISIBILITY_ATTRIBUTE
@@ -31,67 +33,67 @@
int libattr_setxattr(const char *path, const char *name,
void *value, size_t size, int flags)
{
- return setxattr(path, name, value, size, flags);
+ return syscall(__NR_setxattr, path, name, value, size, flags);
}
int libattr_lsetxattr(const char *path, const char *name,
void *value, size_t size, int flags)
{
- return lsetxattr(path, name, value, size, flags);
+ return syscall(__NR_lsetxattr, path, name, value, size, flags);
}
int libattr_fsetxattr(int filedes, const char *name,
void *value, size_t size, int flags)
{
- return fsetxattr(filedes, name, value, size, flags);
+ return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
}
ssize_t libattr_getxattr(const char *path, const char *name,
void *value, size_t size)
{
- return getxattr(path, name, value, size);
+ return syscall(__NR_getxattr, path, name, value, size);
}
ssize_t libattr_lgetxattr(const char *path, const char *name,
void *value, size_t size)
{
- return lgetxattr(path, name, value, size);
+ return syscall(__NR_lgetxattr, path, name, value, size);
}
ssize_t libattr_fgetxattr(int filedes, const char *name,
void *value, size_t size)
{
- return fgetxattr(filedes, name, value, size);
+ return syscall(__NR_fgetxattr, filedes, name, value, size);
}
ssize_t libattr_listxattr(const char *path, char *list, size_t size)
{
- return listxattr(path, list, size);
+ return syscall(__NR_listxattr, path, list, size);
}
ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
{
- return llistxattr(path, list, size);
+ return syscall(__NR_llistxattr, path, list, size);
}
ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
{
- return flistxattr(filedes, list, size);
+ return syscall(__NR_flistxattr, filedes, list, size);
}
int libattr_removexattr(const char *path, const char *name)
{
- return removexattr(path, name);
+ return syscall(__NR_removexattr, path, name);
}
int libattr_lremovexattr(const char *path, const char *name)
{
- return lremovexattr(path, name);
+ return syscall(__NR_lremovexattr, path, name);
}
int libattr_fremovexattr(int filedes, const char *name)
{
- return fremovexattr(filedes, name);
+ return syscall(__NR_fremovexattr, filedes, name);
}
#ifdef HAVE_VISIBILITY_ATTRIBUTE
--
2.19.0.rc0

Binary file not shown.

16
attr-2.5.0.tar.gz.sig Normal file
View file

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEJZs3krPW0xkhLMTc1b+f6wMTZToFAmBKZ5oACgkQ1b+f6wMT
ZTqTexAAnWM3ji5/h8cz3UdHURmX8irXP4yyhkWzX2XUR7y/4ZArw626Mpi7z8WV
7sPTuXzY/FqJiHdmuqpHGoR5fw2jFDhnq5mfoZOky8rTd+avt+BGVdSOeqB4NMaj
G33wkwi8BzumFZQOGmC+QgToqAIPzP7quqzMxd9iSixicprPErjGpxnzeGl229GH
517TNG2kd9blcBPoYjYoOJGPHl6rf4HslnkoBXDgr7zXw1FFSatUQisrT7UgVMkG
XGy0o2FxQ9qxqDK+jU5zU5WFxTtc5ogtTuB0Px/itF54bzmGEW8oY6UzpmEe27qv
7Y0jnfKWiNBO18zirQID+3IQHAUHMFBeIcuE88suY9rKapjmR6W7ZVdEK+q3kVcj
QuxJ1vjqD2jnJlsTLczvqJEKAx/nCVwtVnJNfhVBN27eZ5FKTnlx5Mhgazj1/rYk
xFwR+BhHhmUxLn5ZDKL8NBBUDXuriqznJAzU6ILM/t9zsB/ovhorPKyeXNBG9cFh
BmQDwITGiBhXVt48sN829GSYn2I8AJQzL54nfZ6eOFURol14T0juigl7H57tZb2J
t6XNMfyIeeygvTZtR4rihgrmYCrJGLOTX3SsDmEUqNyICgidVso0mFHHTA5yQqJX
pyiHyWV/RQpVPlLlGZFoyxMLXlnmPtwA715lBiXSM9Adl0Hg8cI=
=rtUC
-----END PGP SIGNATURE-----

View file

@ -1,15 +1,9 @@
Summary: Utilities for managing filesystem extended attributes
Name: attr
Version: 2.4.48
Release: 11%{?dist}
Version: 2.5.0
Release: 1%{?dist}
Source: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.tar.gz
# fix test-suite failure with perl-5.26.0 (#1473853)
Patch1: 0001-attr-2.4.48-test-suite-perl.patch
# fix conflict with fakechroot (https://github.com/dex4er/fakechroot/issues/57)
Patch2: 0002-attr-2.4.48-switch-back-to-syscall.patch
# xattr.conf: remove entries for NFSv4 ACLs namespaces (#1031423)
# https://lists.nongnu.org/archive/html/acl-devel/2019-03/msg00000.html
# https://lists.nongnu.org/archive/html/acl-devel/2019-03/msg00001.html
@ -123,6 +117,9 @@ ln -fs ../sys/xattr.h $RPM_BUILD_ROOT%{_includedir}/attr/xattr.h
%config(noreplace) %{_sysconfdir}/xattr.conf
%changelog
* Fri Mar 12 2021 Kamil Dudka <kdudka@redhat.com> - 2.5.0-1
- new upstream release
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.48-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (attr-2.4.48.tar.gz) = 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
SHA512 (attr-2.5.0.tar.gz) = 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc