From 37911a2f5162db597c0a34a7ea727f877733ef37 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Mon, 20 May 2013 13:02:44 +0200 Subject: [PATCH] new upstream release - 2.4.47 --- .gitignore | 1 + ...s.patch => 0001-attr-2.4.47-warnings.patch | 16 +- 0002-attr-2.4.47-docdir.patch | 25 +++ attr-2.4.32-build.patch | 40 ---- attr-2.4.44-bz660613.patch | 50 ----- attr-2.4.44-bz660619.patch | 61 ------ attr-2.4.44-bz669095.patch | 35 ---- attr-2.4.44-bz957989.patch | 198 ------------------ attr-2.4.44-tests.patch | 22 -- attr-2.4.46.src.tar.gz.sig | Bin 72 -> 0 bytes attr-2.4.47.src.tar.gz.sig | Bin 0 -> 543 bytes attr.spec | 41 +--- sources | 2 +- 13 files changed, 46 insertions(+), 445 deletions(-) rename attr-2.4.44-warnings.patch => 0001-attr-2.4.47-warnings.patch (86%) create mode 100644 0002-attr-2.4.47-docdir.patch delete mode 100644 attr-2.4.32-build.patch delete mode 100644 attr-2.4.44-bz660613.patch delete mode 100644 attr-2.4.44-bz660619.patch delete mode 100644 attr-2.4.44-bz669095.patch delete mode 100644 attr-2.4.44-bz957989.patch delete mode 100644 attr-2.4.44-tests.patch delete mode 100644 attr-2.4.46.src.tar.gz.sig create mode 100644 attr-2.4.47.src.tar.gz.sig diff --git a/.gitignore b/.gitignore index 0fbc9c7..6a86c65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ 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 diff --git a/attr-2.4.44-warnings.patch b/0001-attr-2.4.47-warnings.patch similarity index 86% rename from attr-2.4.44-warnings.patch rename to 0001-attr-2.4.47-warnings.patch index ab11a02..2e8d0e7 100644 --- a/attr-2.4.44-warnings.patch +++ b/0001-attr-2.4.47-warnings.patch @@ -1,7 +1,7 @@ -From b01c9a5805632167acc4c669852093555bfc10ae Mon Sep 17 00:00:00 2001 +From 356db83c304052b89a431670ec35ce037a24bcb6 Mon Sep 17 00:00:00 2001 From: Kamil Dudka -Date: Tue, 19 Apr 2011 08:48:53 +0200 -Subject: [PATCH] fix compile-time warnings in attr-2.4.45 +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 ++++++++-- @@ -41,10 +41,10 @@ index e4a8272..2b1ba6a 100644 printf("\n"); } diff --git a/getfattr/getfattr.c b/getfattr/getfattr.c -index 9c3de32..7ced700 100644 +index 692d2d8..88b59c6 100644 --- a/getfattr/getfattr.c +++ b/getfattr/getfattr.c -@@ -274,8 +274,10 @@ int print_attribute(const char *path, const char *name, int *header_printed) +@@ -275,8 +275,10 @@ int print_attribute(const char *path, const char *name, int *header_printed) *header_printed = 1; } @@ -70,10 +70,10 @@ index bf8f9eb..8835af4 100644 #include #include "misc.h" diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c -index 30ff92a..b87c35c 100644 +index 2be9d47..e7e654d 100644 --- a/libmisc/walk_tree.c +++ b/libmisc/walk_tree.c -@@ -100,8 +100,8 @@ static int walk_tree_rec(const char *path, int walk_flags, +@@ -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 */ @@ -85,5 +85,5 @@ index 30ff92a..b87c35c 100644 struct dirent *entry; -- -1.7.4.2 +1.7.1 diff --git a/0002-attr-2.4.47-docdir.patch b/0002-attr-2.4.47-docdir.patch new file mode 100644 index 0000000..ec3508c --- /dev/null +++ b/0002-attr-2.4.47-docdir.patch @@ -0,0 +1,25 @@ +From b4e37109d66d698772e2513c0f79e818b4235897 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Mon, 20 May 2013 13:17:14 +0200 +Subject: [PATCH] builddefs.in: use pkg version in $(PKG_DOC_DIR) + +--- + include/builddefs.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/builddefs.in b/include/builddefs.in +index d9931db..47bfdd6 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -46,7 +46,7 @@ PKG_LIB_DIR = @libdir@@libdirsuffix@ + PKG_DEVLIB_DIR = @libdir@@libdirsuffix@ + PKG_INC_DIR = @includedir@/attr + PKG_MAN_DIR = @mandir@ +-PKG_DOC_DIR = @datadir@/doc/@pkg_name@ ++PKG_DOC_DIR = @datadir@/doc/@pkg_name@-@pkg_version@ + PKG_LOCALE_DIR = @datadir@/locale + + CC = @cc@ +-- +1.7.1 + diff --git a/attr-2.4.32-build.patch b/attr-2.4.32-build.patch deleted file mode 100644 index a7c3af2..0000000 --- a/attr-2.4.32-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/include/builddefs.in b/include/builddefs.in -index 6df0f5a..575a6df 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -40,14 +40,14 @@ PKG_RELEASE = @pkg_release@ - PKG_VERSION = @pkg_version@ - PKG_PLATFORM = @pkg_platform@ - PKG_DISTRIBUTION= @pkg_distribution@ --PKG_BIN_DIR = @bindir@ --PKG_SBIN_DIR = @sbindir@ --PKG_LIB_DIR = @libdir@@libdirsuffix@ --PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ --PKG_INC_DIR = @includedir@/attr --PKG_MAN_DIR = @mandir@ --PKG_DOC_DIR = @datadir@/doc/@pkg_name@ --PKG_LOCALE_DIR = @datadir@/locale -+PKG_BIN_DIR = $(DESTDIR)@bindir@ -+PKG_SBIN_DIR = $(DESTDIR)@sbindir@ -+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ -+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ -+PKG_INC_DIR = $(DESTDIR)@includedir@/attr -+PKG_MAN_DIR = $(DESTDIR)@mandir@ -+PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@ -+PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale - - CC = @cc@ - AWK = @awk@ -diff --git a/include/buildmacros b/include/buildmacros -index ab89182..3118a17 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/include/install-sh - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images diff --git a/attr-2.4.44-bz660613.patch b/attr-2.4.44-bz660613.patch deleted file mode 100644 index c7beda1..0000000 --- a/attr-2.4.44-bz660613.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bad2f36467d1f606eb418542a23949743708304e Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Wed, 22 Dec 2010 15:03:48 +0100 -Subject: [PATCH] walk_tree: do not follow symlink to directory with -h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -reported by Jean-Pierre André at https://bugzilla.redhat.com/660613 ---- - libmisc/walk_tree.c | 3 ++- - test/attr.test | 8 ++++++++ - 2 files changed, 10 insertions(+), 1 deletions(-) - -diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c -index b82a301..e237e85 100644 ---- a/libmisc/walk_tree.c -+++ b/libmisc/walk_tree.c -@@ -60,7 +60,8 @@ static int walk_tree_rec(const char *path, int walk_flags, - void *), void *arg, int depth) - { - int follow_symlinks = (walk_flags & WALK_TREE_LOGICAL) || -- (!(walk_flags & WALK_TREE_PHYSICAL) && -+ ((walk_flags & WALK_TREE_DEREFERENCE) && -+ !(walk_flags & WALK_TREE_PHYSICAL) && - depth == 0); - int have_dir_stat = 0, flags = walk_flags, err; - struct entry_handle dir; -diff --git a/test/attr.test b/test/attr.test -index 10f10d0..a3e472d 100644 ---- a/test/attr.test -+++ b/test/attr.test -@@ -221,6 +221,14 @@ Attributes of symlinks vs. the files pointed to - - $ rm f - -+Attributes of symlinks vs. the files pointed to in a directory -+ -+ $ mkdir src -+ $ touch src/target -+ $ setfattr -n user.color -v blue src/target -+ $ ln -s src symlink -+ $ getfattr -n user.color -h symlink 2>/dev/null -+ - Tests for file name that contain special characters - - $ touch "f " --- -1.7.3.3 - diff --git a/attr-2.4.44-bz660619.patch b/attr-2.4.44-bz660619.patch deleted file mode 100644 index a925029..0000000 --- a/attr-2.4.44-bz660619.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c3fa3829e494c1875416058bb8d448a89f9e5e55 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Wed, 22 Dec 2010 14:13:27 +0100 -Subject: [PATCH] getfattr: return non-zero exit code on failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -reported by Jean-Pierre André at https://bugzilla.redhat.com/660619 ---- - getfattr/getfattr.c | 7 ++++--- - test/attr.test | 4 ++++ - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/getfattr/getfattr.c b/getfattr/getfattr.c -index 7ced700..d8a7bc5 100644 ---- a/getfattr/getfattr.c -+++ b/getfattr/getfattr.c -@@ -355,6 +355,7 @@ int do_print(const char *path, const struct stat *stat, int walk_flags, - void *unused) - { - int header_printed = 0; -+ int err = 0; - - if (walk_flags & WALK_TREE_FAILED) { - fprintf(stderr, "%s: %s: %s\n", progname, xquote(path, "\n\r"), -@@ -363,13 +364,13 @@ int do_print(const char *path, const struct stat *stat, int walk_flags, - } - - if (opt_name) -- print_attribute(path, opt_name, &header_printed); -+ err = print_attribute(path, opt_name, &header_printed); - else -- list_attributes(path, &header_printed); -+ err = list_attributes(path, &header_printed); - - if (header_printed) - puts(""); -- return 0; -+ return err; - } - - void help(void) -diff --git a/test/attr.test b/test/attr.test -index e8f134c..10f10d0 100644 ---- a/test/attr.test -+++ b/test/attr.test -@@ -22,6 +22,10 @@ Try various valid and invalid names - > user.name - > - -+ $ setfattr -x user.name f -+ $ sh -c 'getfattr -n user.name f && echo zero exit code' -+ > f: user.name: No such attribute -+ - $ setfattr -n user.n -v value f - $ rm f - --- -1.7.3.3 - diff --git a/attr-2.4.44-bz669095.patch b/attr-2.4.44-bz669095.patch deleted file mode 100644 index 3838a3a..0000000 --- a/attr-2.4.44-bz669095.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5c6e19a6ef4b3acb15665fadeb9c7305e1bebaf4 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Thu, 13 Jan 2011 12:08:32 +0100 -Subject: [PATCH] fix typos in attr.1 man page - -Contributed by John Bradshaw. ---- - man/man1/attr.1 | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man/man1/attr.1 b/man/man1/attr.1 -index b265823..392464c 100644 ---- a/man/man1/attr.1 -+++ b/man/man1/attr.1 -@@ -76,7 +76,7 @@ and - address spaces. - The - .B root --address space is accessable only to the superuser, -+address space is accessible only to the superuser, - and then only by specifying a flag argument to the function call. - Other users will not see or be able to modify attributes in the - .B root -@@ -127,7 +127,7 @@ option tells - .I attr - to remove an attribute with the given name from the object if the - attribute exists. --There is no output on sucessful completion. -+There is no output on successful completion. - .TP - .B SET/CREATE - The --- -1.7.4.rc1 - diff --git a/attr-2.4.44-bz957989.patch b/attr-2.4.44-bz957989.patch deleted file mode 100644 index a2ddf2f..0000000 --- a/attr-2.4.44-bz957989.patch +++ /dev/null @@ -1,198 +0,0 @@ -From 182a48b83c0319ec4bad60aecf1b688288bf0f9d Mon Sep 17 00:00:00 2001 -From: Riku Voipio -Date: Wed, 20 Mar 2013 07:51:18 -0700 -Subject: [PATCH] libattr: syscalls: use syscalls.h - -Include syscalls.h and check for __NR_setxattr being set. This fixes the -build on new and odd archs but may break on really really old machines -with out of date syscalls.h. - -[upstream commit db54b565deace6d27eaa158508087ce54fe959c4] - -Signed-off-by: Kamil Dudka ---- - libattr/syscalls.c | 166 +--------------------------------------------------- - 1 files changed, 2 insertions(+), 164 deletions(-) - -diff --git a/libattr/syscalls.c b/libattr/syscalls.c -index cbfec57..51fe98c 100644 ---- a/libattr/syscalls.c -+++ b/libattr/syscalls.c -@@ -23,172 +23,10 @@ - - #include - #include -+#include - --#if defined (__i386__) -+#if defined (__NR_setxattr) - # define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 226 --# define __NR_lsetxattr 227 --# define __NR_fsetxattr 228 --# define __NR_getxattr 229 --# define __NR_lgetxattr 230 --# define __NR_fgetxattr 231 --# define __NR_listxattr 232 --# define __NR_llistxattr 233 --# define __NR_flistxattr 234 --# define __NR_removexattr 235 --# define __NR_lremovexattr 236 --# define __NR_fremovexattr 237 --#elif defined (__sparc__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 169 --# define __NR_lsetxattr 170 --# define __NR_fsetxattr 171 --# define __NR_getxattr 172 --# define __NR_lgetxattr 173 --# define __NR_fgetxattr 177 --# define __NR_listxattr 178 --# define __NR_llistxattr 179 --# define __NR_flistxattr 180 --# define __NR_removexattr 181 --# define __NR_lremovexattr 182 --# define __NR_fremovexattr 186 --#elif defined (__ia64__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 1217 --# define __NR_lsetxattr 1218 --# define __NR_fsetxattr 1219 --# define __NR_getxattr 1220 --# define __NR_lgetxattr 1221 --# define __NR_fgetxattr 1222 --# define __NR_listxattr 1223 --# define __NR_llistxattr 1224 --# define __NR_flistxattr 1225 --# define __NR_removexattr 1226 --# define __NR_lremovexattr 1227 --# define __NR_fremovexattr 1228 --#elif defined (__powerpc__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 209 --# define __NR_lsetxattr 210 --# define __NR_fsetxattr 211 --# define __NR_getxattr 212 --# define __NR_lgetxattr 213 --# define __NR_fgetxattr 214 --# define __NR_listxattr 215 --# define __NR_llistxattr 216 --# define __NR_flistxattr 217 --# define __NR_removexattr 218 --# define __NR_lremovexattr 219 --# define __NR_fremovexattr 220 --#elif defined (__x86_64__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 188 --# define __NR_lsetxattr 189 --# define __NR_fsetxattr 190 --# define __NR_getxattr 191 --# define __NR_lgetxattr 192 --# define __NR_fgetxattr 193 --# define __NR_listxattr 194 --# define __NR_llistxattr 195 --# define __NR_flistxattr 196 --# define __NR_removexattr 197 --# define __NR_lremovexattr 198 --# define __NR_fremovexattr 199 --#elif defined (__s390__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 224 --# define __NR_lsetxattr 225 --# define __NR_fsetxattr 226 --# define __NR_getxattr 227 --# define __NR_lgetxattr 228 --# define __NR_fgetxattr 229 --# define __NR_listxattr 230 --# define __NR_llistxattr 231 --# define __NR_flistxattr 232 --# define __NR_removexattr 233 --# define __NR_lremovexattr 234 --# define __NR_fremovexattr 235 --#elif defined (__arm__) --# define HAVE_XATTR_SYSCALLS 1 --# if defined(__ARM_EABI__) || defined(__thumb__) --# define __NR_SYSCALL_BASE 0 --# else --# define __NR_SYSCALL_BASE 0x900000 --# endif --# define __NR_setxattr (__NR_SYSCALL_BASE+226) --# define __NR_lsetxattr (__NR_SYSCALL_BASE+227) --# define __NR_fsetxattr (__NR_SYSCALL_BASE+228) --# define __NR_getxattr (__NR_SYSCALL_BASE+229) --# define __NR_lgetxattr (__NR_SYSCALL_BASE+230) --# define __NR_fgetxattr (__NR_SYSCALL_BASE+231) --# define __NR_listxattr (__NR_SYSCALL_BASE+232) --# define __NR_llistxattr (__NR_SYSCALL_BASE+233) --# define __NR_flistxattr (__NR_SYSCALL_BASE+234) --# define __NR_removexattr (__NR_SYSCALL_BASE+235) --# define __NR_lremovexattr (__NR_SYSCALL_BASE+236) --# define __NR_fremovexattr (__NR_SYSCALL_BASE+237) --#elif defined (__mips64) --# define HAVE_XATTR_SYSCALLS 1 --# ifdef __LP64__ /* mips64 using n64 ABI */ --# define __NR_Linux 5000 --# else /* mips64 using n32 ABI */ --# define __NR_Linux 6000 --# endif --# define __NR_setxattr (__NR_Linux + 180) --# define __NR_lsetxattr (__NR_Linux + 181) --# define __NR_fsetxattr (__NR_Linux + 182) --# define __NR_getxattr (__NR_Linux + 183) --# define __NR_lgetxattr (__NR_Linux + 184) --# define __NR_fgetxattr (__NR_Linux + 185) --# define __NR_listxattr (__NR_Linux + 186) --# define __NR_llistxattr (__NR_Linux + 187) --# define __NR_flistxattr (__NR_Linux + 188) --# define __NR_removexattr (__NR_Linux + 189) --# define __NR_lremovexattr (__NR_Linux + 190) --# define __NR_fremovexattr (__NR_Linux + 191) --#elif defined (__mips__) /* mips32, or mips64 using o32 ABI */ --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_Linux 4000 --# define __NR_setxattr (__NR_Linux + 224) --# define __NR_lsetxattr (__NR_Linux + 225) --# define __NR_fsetxattr (__NR_Linux + 226) --# define __NR_getxattr (__NR_Linux + 227) --# define __NR_lgetxattr (__NR_Linux + 228) --# define __NR_fgetxattr (__NR_Linux + 229) --# define __NR_listxattr (__NR_Linux + 230) --# define __NR_llistxattr (__NR_Linux + 231) --# define __NR_flistxattr (__NR_Linux + 232) --# define __NR_removexattr (__NR_Linux + 233) --# define __NR_lremovexattr (__NR_Linux + 234) --# define __NR_fremovexattr (__NR_Linux + 235) --#elif defined (__alpha__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 382 --# define __NR_lsetxattr 383 --# define __NR_fsetxattr 384 --# define __NR_getxattr 385 --# define __NR_lgetxattr 386 --# define __NR_fgetxattr 387 --# define __NR_listxattr 388 --# define __NR_llistxattr 389 --# define __NR_flistxattr 390 --# define __NR_removexattr 391 --# define __NR_lremovexattr 392 --# define __NR_fremovexattr 393 --#elif defined (__mc68000__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 223 --# define __NR_lsetxattr 224 --# define __NR_fsetxattr 225 --# define __NR_getxattr 226 --# define __NR_lgetxattr 227 --# define __NR_fgetxattr 228 --# define __NR_listxattr 229 --# define __NR_llistxattr 230 --# define __NR_flistxattr 231 --# define __NR_removexattr 232 --# define __NR_lremovexattr 233 --# define __NR_fremovexattr 234 - #else - # warning "Extended attribute syscalls undefined for this architecture" - # define HAVE_XATTR_SYSCALLS 0 --- -1.7.1 - diff --git a/attr-2.4.44-tests.patch b/attr-2.4.44-tests.patch deleted file mode 100644 index a856cf2..0000000 --- a/attr-2.4.44-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/test/attr.test b/test/attr.test -index d394562..e8f134c 100644 ---- a/test/attr.test -+++ b/test/attr.test -@@ -264,7 +264,7 @@ Tests for proper path recursion reported by Tony Ernst bnc#457660 - $ setfattr -n "user.9" 1/2/3 - $ setfattr -n "user.a" 1/2/3 - -- $ getfattr -h -L -R -m '.' -e hex 1 | ./sort-getfattr-output -+ $ getfattr -h -L -R -m '.' -e hex 1 | grep -v ^security\\.selinux | ./sort-getfattr-output - > # file: 1 - > user.9 - > user.a -@@ -278,7 +278,7 @@ Tests for proper path recursion reported by Tony Ernst bnc#457660 - > user.a - > - -- $ getfattr -h -P -R -m '.' -e hex 1/2 | ./sort-getfattr-output -+ $ getfattr -h -P -R -m '.' -e hex 1/2 | grep -v ^security\\.selinux | ./sort-getfattr-output - > # file: 1/2 - > user.9 - > user.a diff --git a/attr-2.4.46.src.tar.gz.sig b/attr-2.4.46.src.tar.gz.sig deleted file mode 100644 index 725d1d480fe7eb211c25775348c2a642c67f3077..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0!^*W$p8uo5JJdf$yIAc)+=xTo-sAo#5TJrPdqWceK?{3 etCM6f_5h&ZL%e!hx#BZBMmpqqy{q*B{bmV$Rvf7S diff --git a/attr-2.4.47.src.tar.gz.sig b/attr-2.4.47.src.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..abd1c2cc393115629eb276a87a45fb599765cd41 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/attr.spec b/attr.spec index cfe3dea..b037d09 100644 --- a/attr.spec +++ b/attr.spec @@ -1,30 +1,15 @@ Summary: Utilities for managing filesystem extended attributes Name: attr -Version: 2.4.46 -Release: 10%{?dist} +Version: 2.4.47 +Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://download.savannah.gnu.org/releases-noredirect/attr/attr-%{version}.src.tar.gz -# make it ready for rpmbuild -Patch1: attr-2.4.32-build.patch - -# prepare the test-suite for SELinux -Patch3: attr-2.4.44-tests.patch - # silence compile-time warnings -Patch4: attr-2.4.44-warnings.patch +Patch1: 0001-attr-2.4.47-warnings.patch -# getfattr: return non-zero exit code on failure (#660619) -Patch7: attr-2.4.44-bz660619.patch - -# walk_tree: do not follow symlink to directory with -h (#660613) -Patch8: attr-2.4.44-bz660613.patch - -# fix typos in attr(1) man page (#669095) -Patch9: attr-2.4.44-bz669095.patch - -# use to fix build on aarch64 (#957989) -Patch10: attr-2.4.44-bz957989.patch +# use pkg version in $(PKG_DOC_DIR) +Patch2: 0002-attr-2.4.47-docdir.patch License: GPLv2+ URL: http://acl.bestbits.at/ @@ -73,16 +58,10 @@ you'll also want to install attr. %prep %setup -q %patch1 -p1 -%patch3 -p1 -%patch4 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%patch2 -p1 %build -# attr <= 2.4.46 abuses libexecdir (fixed upstream in 2971df45) -%configure --libexecdir=%{_libdir} +%configure # uncomment to turn off optimizations # sed -i 's/-O2/-O0/' libtool include/builddefs @@ -109,8 +88,6 @@ make install-dev DESTDIR=$RPM_BUILD_ROOT make install-lib DESTDIR=$RPM_BUILD_ROOT # get rid of libattr.a and libattr.la -rm -f $RPM_BUILD_ROOT/%{_lib}/libattr.a -rm -f $RPM_BUILD_ROOT/%{_lib}/libattr.la rm -f $RPM_BUILD_ROOT%{_libdir}/libattr.a rm -f $RPM_BUILD_ROOT%{_libdir}/libattr.la @@ -142,6 +119,10 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libattr.so.*.*.* %{_libdir}/libattr.so.* %changelog +* Mon May 20 2013 Kamil Dudka 2.4.47-1 +- new upstream release, drop applied patches +- drop workarounds that are no longer necessary + * Fri May 03 2013 Kamil Dudka 2.4.46-10 - use to fix build on aarch64 (#957989) diff --git a/sources b/sources index 4d9d0e8..227a558 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db557c17fdfa4f785333ecda08654010 attr-2.4.46.src.tar.gz +84f58dec00b60f2dc8fd1c9709291cc7 attr-2.4.47.src.tar.gz