rpms/attr
7
0
Fork 0
Code Issues Pull Requests Releases Activity

new upstream release - 2.4.48

Browse Source
This commit is contained in:
Kamil Dudka 2018-07-03 14:27:02 +02:00
parent 8213b1e76c
commit 864abf0771
9 changed files with 18 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,4 +1 @@
attr-2.4.44.src.tar.gz
/attr-2.4.45.src.tar.gz
/attr-2.4.46.src.tar.gz
/attr-2.4.47.src.tar.gz
/attr-2.4.*.tar.gz

89
0001-attr-2.4.47-warnings.patch
View File

@ -1,89 +0,0 @@
From 356db83c304052b89a431670ec35ce037a24bcb6 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 20 May 2013 12:56:50 +0200
Subject: [PATCH] attr-2.4.44-warnings.patch rebased for 2.4.47
---
attr/attr.c | 10 ++++++++--
getfattr/getfattr.c | 6 ++++--
libmisc/quote.c | 1 +
libmisc/walk_tree.c | 4 ++--
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/attr/attr.c b/attr/attr.c
index e4a8272..2b1ba6a 100644
--- a/attr/attr.c
+++ b/attr/attr.c
@@ -173,9 +173,11 @@ main(int argc, char **argv)
exit(1);
}
if (verbose) {
+ int sink;
printf(_("Attribute \"%s\" set to a %d byte value "
"for %s:\n"), attrname, attrlength, filename);
- fwrite(attrvalue, 1, attrlength, stdout);
+ sink = fwrite(attrvalue, 1, attrlength, stdout);
+ (void) sink;
printf("\n");
}
break;
@@ -199,7 +201,11 @@ main(int argc, char **argv)
printf(_("Attribute \"%s\" had a %d byte value "
"for %s:\n"), attrname, attrlength, filename);
}
- fwrite(attrvalue, 1, attrlength, stdout);
+ {
+ /* silence compiler's warning */
+ int sink = fwrite(attrvalue, 1, attrlength, stdout);
+ (void) sink;
+ }
if (verbose) {
printf("\n");
}
diff --git a/getfattr/getfattr.c b/getfattr/getfattr.c
index 692d2d8..88b59c6 100644
--- a/getfattr/getfattr.c
+++ b/getfattr/getfattr.c
@@ -275,8 +275,10 @@ int print_attribute(const char *path, const char *name, int *header_printed)
*header_printed = 1;
}
- if (opt_value_only)
- fwrite(value, length, 1, stdout);
+ if (opt_value_only) {
+ int sink = fwrite(value, length, 1, stdout);
+ (void) sink;
+ }
else if (length) {
const char *enc = encode(value, &length);
diff --git a/libmisc/quote.c b/libmisc/quote.c
index bf8f9eb..8835af4 100644
--- a/libmisc/quote.c
+++ b/libmisc/quote.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <ctype.h>
#include <string.h>
#include "misc.h"
diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c
index 2be9d47..e7e654d 100644
--- a/libmisc/walk_tree.c
+++ b/libmisc/walk_tree.c
@@ -101,8 +101,8 @@ static int walk_tree_rec(const char *path, int walk_flags,
* a dir not from a symlink
* a link and follow_symlinks
*/
- if ((flags & WALK_TREE_RECURSIVE) &&
- (!(flags & WALK_TREE_SYMLINK) && S_ISDIR(st.st_mode)) ||
+ if (((flags & WALK_TREE_RECURSIVE) &&
+ (!(flags & WALK_TREE_SYMLINK) && S_ISDIR(st.st_mode))) ||
((flags & WALK_TREE_SYMLINK) && follow_symlinks)) {
struct dirent *entry;
--
1.7.1

0
0004-attr-2.4.47-test-suite-perl.patch → 0001-attr-2.4.48-test-suite-perl.patch
View File

78
0002-attr-2.4.47-xattr-conf.patch
View File

@ -1,78 +0,0 @@
From 78fd043ba4378c7db84288c76911a57d4d5ff848 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@linbit.com>
Date: Mon, 18 Nov 2013 22:11:44 +0100
Subject: [PATCH] Add a default /etc/xattr.conf file
[upstream commit fe92f96a4d8b017b73d1eb262d4ea3be5e9d48df]
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
Makefile | 4 ++++
include/builddefs.in | 1 +
xattr.conf | 20 ++++++++++++++++++++
3 files changed, 25 insertions(+), 0 deletions(-)
create mode 100644 xattr.conf
diff --git a/Makefile b/Makefile
index 4443fe0..f94f457 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@ CONFIGURE = \
configure config.guess config.sub \
ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
m4/ltversion.m4 m4/lt~obsolete.m4
+SRCFILES = \
+ xattr.conf
LSRCFILES = \
configure.in Makepkgs install-sh exports README VERSION \
$(CONFIGURE)
@@ -92,6 +94,8 @@ include/config.h: include/builddefs
install: default $(addsuffix -install,$(SUBDIRS))
$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
$(INSTALL) -m 644 README $(PKG_DOC_DIR)
+ $(INSTALL) -m 755 -d $(PKG_CONF_DIR)
+ $(INSTALL) -m 644 xattr.conf $(PKG_CONF_DIR)
install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
diff --git a/include/builddefs.in b/include/builddefs.in
index d9931db..f888d25 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -48,6 +48,7 @@ PKG_INC_DIR = @includedir@/attr
PKG_MAN_DIR = @mandir@
PKG_DOC_DIR = @datadir@/doc/@pkg_name@
PKG_LOCALE_DIR = @datadir@/locale
+PKG_CONF_DIR = @sysconfdir@
CC = @cc@
AWK = @awk@
diff --git a/xattr.conf b/xattr.conf
new file mode 100644
index 0000000..e1f2215
--- /dev/null
+++ b/xattr.conf
@@ -0,0 +1,20 @@
+# /etc/xattr.conf
+#
+# Format:
+# <pattern> <action>
+#
+# Actions:
+# permissions - copy when trying to preserve permissions.
+# skip - do not copy.
+
+system.nfs4_acl permissions
+system.nfs4acl permissions
+system.posix_acl_access permissions
+system.posix_acl_default permissions
+trusted.SGI_ACL_DEFAULT skip # xfs specific
+trusted.SGI_ACL_FILE skip # xfs specific
+trusted.SGI_CAP_FILE skip # xfs specific
+trusted.SGI_DMI_* skip # xfs specific
+trusted.SGI_MAC_FILE skip # xfs specific
+xfsroot.* skip # xfs specific; obsolete
+user.Beagle.* skip # ignore Beagle index data
--
1.7.1

40
0003-attr-2.4.47-test-suite.patch
View File

@ -1,40 +0,0 @@
From 080ffdf051aff85688e4e35fc58c5c7eedcdd480 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
Date: Tue, 3 Mar 2015 18:15:07 +0100
Subject: [PATCH] Remove outdated tests from test/attr.test
Extended attributes are not accounted for in the real file size on most file
systems, not even in ext* file systems with large inodes. Remove the
associated tests.
Upstream-commit: 07cdd574b01309599c5ceddcd3d6553a5f5cd75d
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
test/attr.test | 4 ----
1 file changed, 4 deletions(-)
diff --git a/test/attr.test b/test/attr.test
index 1f755ae..9f750b0 100644
--- a/test/attr.test
+++ b/test/attr.test
@@ -92,8 +92,6 @@ Everything with one file
$ setfattr -n user.longername -v longervalue f
$ setfattr -n user.short -v value f
$ setfattr -n user.novalue-yet f
- $ ls -s f
- > 4 f
$ getfattr -d f
> # file: f
@@ -130,8 +128,6 @@ Everything with one file
$ setfattr -x user.novalue f
$ setfattr -x user.novalue-yet f
$ getfattr -d f
- $ ls -s f
- > 0 f
$ rm f
--
2.5.0

BIN
attr-2.4.47.src.tar.gz.sig
View File

Binary file not shown.

BIN
attr-2.4.48.tar.gz.sig Normal file
View File

Binary file not shown.

53
attr.spec
View File

@ -1,20 +1,11 @@
Summary: Utilities for managing filesystem extended attributes
Name: attr
Version: 2.4.47
Release: 23%{?dist}
Source: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.src.tar.gz
# silence compile-time warnings
Patch1: 0001-attr-2.4.47-warnings.patch
# install /etc/xattr.conf
Patch2: 0002-attr-2.4.47-xattr-conf.patch
# remove outdated tests from test/attr.test
Patch3: 0003-attr-2.4.47-test-suite.patch
Version: 2.4.48
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)
Patch4: 0004-attr-2.4.47-test-suite-perl.patch
Patch1: 0001-attr-2.4.48-test-suite-perl.patch
License: GPLv2+
URL: https://savannah.nongnu.org/projects/attr
@ -63,48 +54,32 @@ you'll also want to install attr.
%prep
%autosetup -p1
# FIXME: root tests are not ready for SELinux
sed -e 's|test/root/getfattr.test||' \
-i test/Makemodule.am Makefile.in
%build
%configure
make %{?_smp_mflags}
%check
if ./setfattr/setfattr -n user.name -v value .; then
make tests || exit $?
# FIXME: root-tests are not ready for the SELinux
#if test 0 = `id -u`; then
# make root-tests || exit $?
#fi
if ./setfattr -n user.name -v value .; then
make check || exit $?
else
echo '*** xattrs are probably not supported by the file system,' \
'the test-suite will NOT run ***'
fi
%install
make install DESTDIR=$RPM_BUILD_ROOT
make install-dev DESTDIR=$RPM_BUILD_ROOT
make install-lib DESTDIR=$RPM_BUILD_ROOT
%make_install
# get rid of libattr.a and libattr.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libattr.a
rm -f $RPM_BUILD_ROOT%{_libdir}/libattr.la
chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libattr.so.*.*.*
rm -f $RPM_BUILD_ROOT%{_libdir}/libattr.{l,}a
# drop already installed documentation, we will use an RPM macro to install it
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
# {,f,l}{get,list,remove,set}xattr.2 man pages are now provided by man-pages pkg
# See <http://lists.nongnu.org/archive/html/acl-devel/2014-03/msg00010.html>.
rm -fv $RPM_BUILD_ROOT%{_mandir}/man2/{,f,l}{get,list,remove,set}xattr.2*
rmdir "$RPM_BUILD_ROOT%{_mandir}/man2"
# The attr.5 man page was moved to the man-pages package.
# See <http://git.savannah.gnu.org/cgit/attr.git/commit/?id=dce9b444>.
rm -fv $RPM_BUILD_ROOT%{_mandir}/man5/attr.5*
rmdir "$RPM_BUILD_ROOT%{_mandir}/man5"
%find_lang %{name}
%ldconfig_scriptlets -n libattr
@ -122,6 +97,7 @@ rmdir "$RPM_BUILD_ROOT%{_mandir}/man5"
%files -n libattr-devel
%{_libdir}/libattr.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/attr
%{_mandir}/man3/attr_*.3.*
@ -130,6 +106,9 @@ rmdir "$RPM_BUILD_ROOT%{_mandir}/man5"
%config(noreplace) %{_sysconfdir}/xattr.conf
%changelog
* Tue Jul 03 2018 Kamil Dudka <kdudka@redhat.com> 2.4.48-1
- new upstream release
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.47-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
84f58dec00b60f2dc8fd1c9709291cc7 attr-2.4.47.src.tar.gz
SHA512 (attr-2.4.48.tar.gz) = 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923