From 1e8051ab57e726404e39ddf59b995fc43005d749 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 31 Mar 2021 15:20:41 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/attr.git#ccb2c1ad4b81da41c2190b22969662637e671d2e --- .gitignore | 2 +- 0001-attr-2.4.48-test-suite-perl.patch | 29 ----- 0002-attr-2.4.48-switch-back-to-syscall.patch | 123 ------------------ attr-2.4.48.tar.gz.sig | Bin 566 -> 0 bytes attr-2.5.1.tar.gz.sig | Bin 0 -> 566 bytes attr.spec | 16 +-- sources | 2 +- 7 files changed, 10 insertions(+), 162 deletions(-) delete mode 100644 0001-attr-2.4.48-test-suite-perl.patch delete mode 100644 0002-attr-2.4.48-switch-back-to-syscall.patch delete mode 100644 attr-2.4.48.tar.gz.sig create mode 100644 attr-2.5.1.tar.gz.sig diff --git a/.gitignore b/.gitignore index a385c1d..198db35 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/attr-2.4.*.tar.gz +/attr-2.[45].*.tar.gz diff --git a/0001-attr-2.4.48-test-suite-perl.patch b/0001-attr-2.4.48-test-suite-perl.patch deleted file mode 100644 index f91562f..0000000 --- a/0001-attr-2.4.48-test-suite-perl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 46baedf88fe22abafa3f2341b2c1bcb4764ce389 Mon Sep 17 00:00:00 2001 -From: Troy Dawson -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 ---- - 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 - diff --git a/0002-attr-2.4.48-switch-back-to-syscall.patch b/0002-attr-2.4.48-switch-back-to-syscall.patch deleted file mode 100644 index 8679358..0000000 --- a/0002-attr-2.4.48-switch-back-to-syscall.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -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 -+#include - #include - - #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 - diff --git a/attr-2.4.48.tar.gz.sig b/attr-2.4.48.tar.gz.sig deleted file mode 100644 index 2d9355d620dae270c185712ee3740d7f33319e9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+=0<|X-CHRu8B^uO0V>_SdH}!!90$V6(VE_sV5J6)* zpXfLBfv*G)|9dKr8tqNrj>dz;KRDqOzyGGYlIjQQZWH65L`EG8uL+CfI(-gNG9Qeu zs!9&DDTpH0&i(@CPuH-zy!Sc1WqM|^HR<-3)%9}>zLCfC^Sz_L1@nbk6VcF$0wMSj z-;p-$P6@fSZYGS6UL?XtDNsHT`0HjDr?3!=2xYO(en5`s;Qs)A@hmklef*J#-W$cv z6P{0$(}4NzB4&ze4c$|HhTw_D%hJ+2oig%X$tn7(_#X@J8NoFv95P&2N?7ZVT^hoO zE)J~M4X|>f1$VQe6Eo`}iX4;nr;!_{h^rBr}58Sei|aSvwGzqT#Snh4lo4d z#M(`ZUUVOiGG;9TfPRLi7jwm02qi~$ZWo+xrkwvC}Eo47CAa} z*48pVd9(2byu1oZ`sTEkLD2oVFBq4Kmeslm*IRF(ky&H~X76s4y8osC?xGKBK~NH3 zXN<ECAbCnjvdXuI@82^=--8PYDbcLpkXz_V|!v=Bi|P4Tay0{;<0!)fH~ zQOqa@eqmlyq}Z1LD9Wi>RmuiAeT8tXu#${CpU6}~Xk(i7FePD|PNqf!!8DZMXgLpp E)8fSsTL1t6 diff --git a/attr-2.5.1.tar.gz.sig b/attr-2.5.1.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..0a0756e0edd31f3575279d18e43560052d7f1384 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*Bn>UiP*3%gwEX3T^zn|*^6JjM*II{y?8|4CcB`&w#hn73@4?aM!omBz#_5U6Z_b#=32^l;LO)J^ip9UL@UJV1>_ zz5j`gcPzpJ;kN-Ko8(%>m1^YEHEFs-HsZmJ0NN2PIa@&$R*gvVa>`K|%{z1egbVuiyxM+oH-B^2d%9Q)&jFCSd#q2e!1LdKfVMMV zDhE9_ZCO|9p?h21FctsHn{e9Sw6 zxZ2o6HoKH}bo1f+CeA}T)N|#bjE6(Q)CugbXFPxN#$rqxGaw?ir~Dv$vM_QlA~m!? zdPi5w#K-{`2KyJZm~eZ>{$@ARl*y;mM+GjQRfiWSg4FR3ghJCz)E2u8?GyBd~kx|zk%OJ$x|19zR) zJJriJp$I{WXmsmWTGBCAcksU|QRhG{BLJJagE?ed$je_I)l zBY2GT$oBII;aK}#Z0#;5a$W6QhO@_4^wj`45sJlR&Bd*jaMu{*J2EYFJGz(m|k$m+chY-4-A&5 EH{UrIQvd(} literal 0 HcmV?d00001 diff --git a/attr.spec b/attr.spec index 1f374d0..050a1cb 100644 --- a/attr.spec +++ b/attr.spec @@ -1,15 +1,9 @@ Summary: Utilities for managing filesystem extended attributes Name: attr -Version: 2.4.48 -Release: 11%{?dist} +Version: 2.5.1 +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,12 @@ ln -fs ../sys/xattr.h $RPM_BUILD_ROOT%{_includedir}/attr/xattr.h %config(noreplace) %{_sysconfdir}/xattr.conf %changelog +* Tue Mar 16 2021 Kamil Dudka - 2.5.1-1 +- new upstream release + +* Fri Mar 12 2021 Kamil Dudka - 2.5.0-1 +- new upstream release + * Tue Jan 26 2021 Fedora Release Engineering - 2.4.48-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index f7181f8..a7e4fdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (attr-2.4.48.tar.gz) = 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 +SHA512 (attr-2.5.1.tar.gz) = 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b