Update attr

This commit is contained in:
suhan-paradkar 2021-05-01 04:02:24 +00:00 committed by Leonid Pliushch
parent e0a6eefc4b
commit ba775c114d
2 changed files with 18 additions and 18 deletions

View File

@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://savannah.nongnu.org/projects/attr/
TERMUX_PKG_DESCRIPTION="Utilities for manipulating filesystem extended attributes"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.4.48
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=2.5.1
TERMUX_PKG_REVISION=0
TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/attr/attr-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7
TERMUX_PKG_SHA256=bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8
TERMUX_PKG_BREAKS="attr-dev"
TERMUX_PKG_REPLACES="attr-dev"
TERMUX_PKG_BUILD_IN_SRC=true

View File

@ -1,25 +1,25 @@
diff -u -r ../attr-2.4.47/libmisc/walk_tree.c ./libmisc/walk_tree.c
--- ../attr-2.4.47/libmisc/walk_tree.c 2013-05-19 00:53:54.000000000 -0400
+++ ./libmisc/walk_tree.c 2015-12-13 14:47:30.178955536 -0500
@@ -122,7 +122,11 @@
--- /attr-2.5.1/libmisc/walk_tree.c 2021-03-11 18:14:35.000000000 +0000
+++ libmisc/walk_tree.c 2021-04-29 04:14:06.292962485 +0000
@@ -136,7 +136,11 @@
close_another_dir:
/* Close the topmost directory handle still open. */
closed = closed->prev;
args->closed = args->closed->prev;
+#ifdef __ANDROID__
+ closed->pos = -1;
+ args->closed->pos = -1;
+#else
closed->pos = telldir(closed->stream);
args->closed->pos = telldir(args->closed->stream);
+#endif
closedir(closed->stream);
closed->stream = NULL;
num_dir_handles++;
@@ -188,7 +192,9 @@
if (!dir.stream)
return err + func(path, NULL, flags |
WALK_TREE_FAILED, arg);
closedir(args->closed->stream);
args->closed->stream = NULL;
args->num_dir_handles++;
@@ -206,7 +210,9 @@
NULL,
flags | WALK_TREE_FAILED,
args->arg);
+#ifndef __ANDROID__
seekdir(dir.stream, dir.pos);
+#endif
closed = closed->next;
num_dir_handles--;
args->closed = args->closed->next;
args->num_dir_handles--;