From 864abf0771ae70102a6ef59dd6629fcb0b5ff0c4 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Tue, 3 Jul 2018 14:27:02 +0200 Subject: [PATCH] new upstream release - 2.4.48 --- .gitignore | 5 +- 0001-attr-2.4.47-warnings.patch | 89 ------------------ ... => 0001-attr-2.4.48-test-suite-perl.patch | 0 0002-attr-2.4.47-xattr-conf.patch | 78 --------------- 0003-attr-2.4.47-test-suite.patch | 40 -------- attr-2.4.47.src.tar.gz.sig | Bin 543 -> 0 bytes attr-2.4.48.tar.gz.sig | Bin 0 -> 566 bytes attr.spec | 53 ++++------- sources | 2 +- 9 files changed, 18 insertions(+), 249 deletions(-) delete mode 100644 0001-attr-2.4.47-warnings.patch rename 0004-attr-2.4.47-test-suite-perl.patch => 0001-attr-2.4.48-test-suite-perl.patch (100%) delete mode 100644 0002-attr-2.4.47-xattr-conf.patch delete mode 100644 0003-attr-2.4.47-test-suite.patch delete mode 100644 attr-2.4.47.src.tar.gz.sig create mode 100644 attr-2.4.48.tar.gz.sig diff --git a/.gitignore b/.gitignore index 6a86c65..a385c1d 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/0001-attr-2.4.47-warnings.patch b/0001-attr-2.4.47-warnings.patch deleted file mode 100644 index 2e8d0e7..0000000 --- a/0001-attr-2.4.47-warnings.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 356db83c304052b89a431670ec35ce037a24bcb6 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -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 - #include -+#include - #include - #include - #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 - diff --git a/0004-attr-2.4.47-test-suite-perl.patch b/0001-attr-2.4.48-test-suite-perl.patch similarity index 100% rename from 0004-attr-2.4.47-test-suite-perl.patch rename to 0001-attr-2.4.48-test-suite-perl.patch diff --git a/0002-attr-2.4.47-xattr-conf.patch b/0002-attr-2.4.47-xattr-conf.patch deleted file mode 100644 index 00dce32..0000000 --- a/0002-attr-2.4.47-xattr-conf.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 78fd043ba4378c7db84288c76911a57d4d5ff848 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -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 ---- - 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: -+# -+# -+# 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 - diff --git a/0003-attr-2.4.47-test-suite.patch b/0003-attr-2.4.47-test-suite.patch deleted file mode 100644 index a07b1e4..0000000 --- a/0003-attr-2.4.47-test-suite.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 080ffdf051aff85688e4e35fc58c5c7eedcdd480 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -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 ---- - 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 - diff --git a/attr-2.4.47.src.tar.gz.sig b/attr-2.4.47.src.tar.gz.sig deleted file mode 100644 index abd1c2cc393115629eb276a87a45fb599765cd41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-l+-nIY=2@n-SLnZ}6-!yiY5B?yRusZK;23X!YDhAEa z#$?&A_$IqSmB7(Lb?aacO7I&Y0%N5mVCl20^B zI`L+^lA_krH9ksQTdwz-{o`{$DhlxHTf*;(4eJ&H!{Ol2F z5EM&+>z0Nimh}3WFJPE^JRTo}IJZ=__ZS<)ZRQtcDi&hw9lvP=(jbp6?s%pyb8M`N z_!3iC$rk^b49nHWEzS-G&~t_8Jcp4I>=vjr{XFw24q95$%0K@%Hw|>L6jxDOOWIgJ zwLa#4n1jhy%Fuq4tpbDsdqAHh<&E9lD|CXKnU;{~;JTTW_?00$V+-q!2zXKQuF#;5 z`N?T#xr$W(RWtuIZ;}2H0pZ%9)Y1a-6dc{X*Zp!dztCRpD_9)nTl4I)JXt`q*$DHk;3;ZGWb60slemsQ$A>(P2R%0;iFIFZBOI zuAZmw{SVF{@95;k=eisJvd?{z=woE*0PGSr_xE43Yz}aLU3gjsL(8};uevFf>_v>5 zyUI-OC;8ERk}RgnjNNU-%M>4W6K(@{^(b6KPwQfbxpWzWaEuuro%un)88s>)4A1kg h=V+09ySdtrrAdU6Hf>b&xtLlbbLo>*Ay7!#eTpz&4N?FA diff --git a/attr-2.4.48.tar.gz.sig b/attr-2.4.48.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..2d9355d620dae270c185712ee3740d7f33319e9a GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/attr.spec b/attr.spec index 9a3c675..8df3ea0 100644 --- a/attr.spec +++ b/attr.spec @@ -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 . -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 . -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 2.4.48-1 +- new upstream release + * Wed Feb 07 2018 Fedora Release Engineering - 2.4.47-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 227a558..f7181f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84f58dec00b60f2dc8fd1c9709291cc7 attr-2.4.47.src.tar.gz +SHA512 (attr-2.4.48.tar.gz) = 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923