diff --git a/0003-attr-2.4.47-man-ENOATTR.patch b/0003-attr-2.4.47-man-ENOATTR.patch new file mode 100644 index 0000000..b131494 --- /dev/null +++ b/0003-attr-2.4.47-man-ENOATTR.patch @@ -0,0 +1,165 @@ +From aae1fcdea2c9e3c55db44ad768e4155312d3f029 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Tue, 21 Jan 2014 14:22:50 +0100 +Subject: [PATCH] attr: refer to ENODATA instead of ENOATTR in man pages + +The ENOATTR alias is only provided if is included, not +with the more standard header file. ENODATA is correct +in both cases. + +Reported by: Florian Weimer +Bug: https://bugzilla.redhat.com/1055933 +--- + man/man2/getxattr.2 | 2 +- + man/man2/removexattr.2 | 2 +- + man/man2/setxattr.2 | 2 +- + man/man3/attr_get.3 | 4 ++-- + man/man3/attr_list.3 | 2 +- + man/man3/attr_multi.3 | 2 +- + man/man3/attr_remove.3 | 4 ++-- + man/man3/attr_set.3 | 6 +++--- + 8 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/man/man2/getxattr.2 b/man/man2/getxattr.2 +index 405ad89..a093476 100644 +--- a/man/man2/getxattr.2 ++++ b/man/man2/getxattr.2 +@@ -108,7 +108,7 @@ is set appropriately. + If the named attribute does not exist, or the process has no access to + this attribute, + .I errno +-is set to ENOATTR. ++is set to ENODATA. + .PP + If the + .I size +diff --git a/man/man2/removexattr.2 b/man/man2/removexattr.2 +index 2c7d934..d865e48 100644 +--- a/man/man2/removexattr.2 ++++ b/man/man2/removexattr.2 +@@ -84,7 +84,7 @@ is set appropriately. + .PP + If the named attribute does not exist, + .I errno +-is set to ENOATTR. ++is set to ENODATA. + .PP + If extended attributes are not supported by the filesystem, or are disabled, + .I errno +diff --git a/man/man2/setxattr.2 b/man/man2/setxattr.2 +index b20dc9f..081cf93 100644 +--- a/man/man2/setxattr.2 ++++ b/man/man2/setxattr.2 +@@ -112,7 +112,7 @@ If XATTR_CREATE is specified, and the attribute exists already, + is set to EEXIST. + If XATTR_REPLACE is specified, and the attribute does not exist, + .I errno +-is set to ENOATTR. ++is set to ENODATA. + .PP + If there is insufficient space remaining to store the extended attribute, + .I errno +diff --git a/man/man3/attr_get.3 b/man/man3/attr_get.3 +index 7908340..0b3c15b 100644 +--- a/man/man3/attr_get.3 ++++ b/man/man3/attr_get.3 +@@ -89,7 +89,7 @@ The default is to follow symbolic links. + will fail if one or more of the following are true: + .TP 17 + .SM +-\%[ENOATTR] ++\%[ENODATA] + The attribute name given is not associated with the indicated + filesystem object. + .TP +@@ -155,7 +155,7 @@ or a pathname component is longer than + will fail if: + .TP 15 + .SM +-\%[ENOATTR] ++\%[ENODATA] + The attribute name given is not associated with the indicated + filesystem object. + .TP +diff --git a/man/man3/attr_list.3 b/man/man3/attr_list.3 +index 978cfff..d9aedce 100644 +--- a/man/man3/attr_list.3 ++++ b/man/man3/attr_list.3 +@@ -240,7 +240,7 @@ or a pathname component is longer than + .RI { MAXNAMELEN }. + .TP + .SM +-\%[ENOATTR] ++\%[ENODATA] + .I attribute\^ + does not exist for this file. + .PP +diff --git a/man/man3/attr_multi.3 b/man/man3/attr_multi.3 +index db0381c..131d5ad 100644 +--- a/man/man3/attr_multi.3 ++++ b/man/man3/attr_multi.3 +@@ -165,7 +165,7 @@ field to EEXIST if the named attribute already exists. + If the \f4ATTR_REPLACE\fP flag is set, + the sub-operation will set the + .I am_error +-field to ENOATTR if the named attribute does not already exist. ++field to ENODATA if the named attribute does not already exist. + If neither of those two flags are set and the attribute does not exist, + then the attribute will be created with the given value. + If neither of those two flags are set and the attribute already exists, +diff --git a/man/man3/attr_remove.3 b/man/man3/attr_remove.3 +index 6fd6a3d..1313f3f 100644 +--- a/man/man3/attr_remove.3 ++++ b/man/man3/attr_remove.3 +@@ -77,7 +77,7 @@ The default is to follow symbolic links. + will fail if one or more of the following are true: + .TP 17 + .SM +-\%[ENOATTR] ++\%[ENODATA] + The attribute name given is not associated with the indicated + filesystem object. + .TP +@@ -136,7 +136,7 @@ or a pathname component is longer than + will fail if: + .TP 15 + .SM +-\%[ENOATTR] ++\%[ENODATA] + The attribute name given is not associated with the indicated + filesystem object. + .TP +diff --git a/man/man3/attr_set.3 b/man/man3/attr_set.3 +index 9f49c48..f124cfa 100644 +--- a/man/man3/attr_set.3 ++++ b/man/man3/attr_set.3 +@@ -97,7 +97,7 @@ are set in the same call. + .TP + .SM + \%ATTR_REPLACE +-Return an error (ENOATTR) if an attribute of the given name ++Return an error (ENODATA) if an attribute of the given name + does not already exist on the indicated filesystem object, + otherwise replace the existing attribute\'s value with the given value. + This flag is used to implement a pure replacement operation, +@@ -111,7 +111,7 @@ are set in the same call. + will fail if one or more of the following are true: + .TP 17 + .SM +-\%[ENOATTR] ++\%[ENODATA] + The attribute name given is not associated with the indicated + filesystem object and the ATTR_REPLACE flag bit was set. + .TP +@@ -184,7 +184,7 @@ or a pathname component is longer than + will fail if: + .TP 15 + .SM +-\%[ENOATTR] ++\%[ENODATA] + The attribute name given is not associated with the indicated + filesystem object and the ATTR_REPLACE flag bit was set. + .TP +-- +1.7.1 + diff --git a/attr.spec b/attr.spec index 1cbc4a1..010e21f 100644 --- a/attr.spec +++ b/attr.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing filesystem extended attributes Name: attr Version: 2.4.47 -Release: 4%{?dist} +Release: 5%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://download.savannah.gnu.org/releases-noredirect/attr/attr-%{version}.src.tar.gz @@ -11,6 +11,9 @@ Patch1: 0001-attr-2.4.47-warnings.patch # install /etc/xattr.conf Patch2: 0002-attr-2.4.47-xattr-conf.patch +# refer to ENODATA instead of ENOATTR in man pages (#1055933) +Patch3: 0003-attr-2.4.47-man-ENOATTR.patch + License: GPLv2+ URL: http://acl.bestbits.at/ Group: System Environment/Base @@ -59,6 +62,7 @@ you'll also want to install attr. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure @@ -123,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}* %config(noreplace) %{_sysconfdir}/xattr.conf %changelog +* Tue Jan 21 2014 Kamil Dudka 2.4.47-5 +- refer to ENODATA instead of ENOATTR in man pages (#1055933) + * Tue Nov 19 2013 Kamil Dudka 2.4.47-4 - provide /etc/xattr.conf to exclude copying certain extended attrs (#1031423)