summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorMaxim Storchak <m.storchak@gmail.com>2021-03-21 13:32:16 +0200
committerRosen Penev <rosenp@gmail.com>2021-03-21 10:32:01 -0700
commit796ae80e44cf6e3776eab9158ee4f8df492edc57 (patch)
tree22d0b741822e33fe863c83076b21b27b9e62eb51 /utils
parentc4feffb0a149ba7878936f94df3ec02105a69ebe (diff)
attr: update to 2.5.1
- swith to AUTORELEASE Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/attr/Makefile6
-rw-r--r--utils/attr/patches/100-no-gettext_configure.patch4
-rw-r--r--utils/attr/patches/110-Replace-bzero-with-memset.patch60
3 files changed, 5 insertions, 65 deletions
diff --git a/utils/attr/Makefile b/utils/attr/Makefile
index eb107ce8f..88ca5c19f 100644
--- a/utils/attr/Makefile
+++ b/utils/attr/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=attr
-PKG_VERSION:=2.4.48
-PKG_RELEASE:=2
+PKG_VERSION:=2.5.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://git.savannah.nongnu.org/cgit/attr.git/snapshot
-PKG_HASH:=095699f71230ace37e5bc680c6f9d15cf8e53eb38d00b2c46db5cc7e0712e5f3
+PKG_HASH:=69991b2fc5fe7917d996b05d5d4fe3c44d074c9d806dd263b14a42fab57bfc2f
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
diff --git a/utils/attr/patches/100-no-gettext_configure.patch b/utils/attr/patches/100-no-gettext_configure.patch
index dea6f2ed9..ec259970a 100644
--- a/utils/attr/patches/100-no-gettext_configure.patch
+++ b/utils/attr/patches/100-no-gettext_configure.patch
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -34,9 +34,6 @@ AC_FUNC_GCC_VISIBILITY
+@@ -35,9 +35,6 @@ AC_SYS_LARGEFILE
AM_PROG_AR
LT_INIT
@@ -10,7 +10,7 @@
AC_ARG_ENABLE([debug],
[AS_HELP_STRING([--enable-debug], [Enable extra debugging])])
AS_IF([test "x$enable_debug" = "xyes"],
-@@ -55,6 +52,5 @@ AC_CONFIG_COMMANDS([include/attr],
+@@ -61,6 +58,5 @@ AC_CONFIG_COMMANDS([include/attr],
AC_CONFIG_FILES([
libattr.pc
Makefile
diff --git a/utils/attr/patches/110-Replace-bzero-with-memset.patch b/utils/attr/patches/110-Replace-bzero-with-memset.patch
deleted file mode 100644
index cfae36a09..000000000
--- a/utils/attr/patches/110-Replace-bzero-with-memset.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 0ce120a140dadaa56875af2efc66ff805d37925b Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Sun, 11 Aug 2019 16:17:11 -0700
-Subject: [PATCH] attr: Replace bzero with memset
-
-bzero is a deprecated function that is optionally unavailable with
-uClibc-ng.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- include/attributes.h | 4 ++--
- libattr/libattr.c | 4 ++--
- tools/attr.c | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/include/attributes.h
-+++ b/include/attributes.h
-@@ -91,9 +91,9 @@ typedef struct attrlist_ent { /* data fr
- * Implement a "cursor" for use in successive attr_list() calls.
- * It provides a way to find the last attribute that was returned in the
- * last attr_list() call so that we can get the next one without missing
-- * any. This should be bzero()ed before use and whenever it is desired to
-+ * any. This should be zeroed before use and whenever it is desired to
- * start over from the beginning of the attribute list. The only valid
-- * operation on a cursor is to bzero() it.
-+ * operation on a cursor is to zero it.
- */
- typedef struct attrlist_cursor {
- uint32_t opaque[4]; /* an opaque cookie */
---- a/libattr/libattr.c
-+++ b/libattr/libattr.c
-@@ -298,7 +298,7 @@ attr_list(const char *path, char *buffer
- errno = EINVAL;
- return -1;
- }
-- bzero(buffer, sizeof(attrlist_t));
-+ memset(buffer, 0, sizeof(attrlist_t));
-
- if (flags & ATTR_DONTFOLLOW)
- length = llistxattr(path, lbuf, sizeof(lbuf));
-@@ -348,7 +348,7 @@ attr_listf(int fd, char *buffer, const i
- errno = EINVAL;
- return -1;
- }
-- bzero(buffer, sizeof(attrlist_t));
-+ memset(buffer, 0, sizeof(attrlist_t));
-
- length = flistxattr(fd, lbuf, sizeof(lbuf));
- if (length < 0)
---- a/tools/attr.c
-+++ b/tools/attr.c
-@@ -228,7 +228,7 @@ main(int argc, char **argv)
- perror("malloc");
- exit(1);
- }
-- bzero((char *)&cursor, sizeof(cursor));
-+ memset(&cursor, 0, sizeof(cursor));
- do {
- error = attr_list(filename, buffer, BUFSIZE,
- attrflags, &cursor);