From c13f3ac6aeee735177e6b384944d8d221a37de2c Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 26 Jun 2018 05:24:00 +0200
Subject: [PATCH] attr: Update from 2.4.47 to 2.4.48

---
 packages/attr/attr.c.patch          | 11 -------
 packages/attr/build.sh              |  8 ++---
 packages/attr/include-xattr.h.patch | 45 -----------------------------
 packages/attr/tools-attr.c.patch    | 11 +++++++
 4 files changed, 15 insertions(+), 60 deletions(-)
 delete mode 100644 packages/attr/attr.c.patch
 delete mode 100644 packages/attr/include-xattr.h.patch
 create mode 100644 packages/attr/tools-attr.c.patch

diff --git a/packages/attr/attr.c.patch b/packages/attr/attr.c.patch
deleted file mode 100644
index 44bd4d9e4..000000000
--- a/packages/attr/attr.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r ../attr-2.4.47/attr/attr.c ./attr/attr.c
---- ../attr-2.4.47/attr/attr.c	2013-05-19 06:53:54.000000000 +0200
-+++ ./attr/attr.c	2017-02-02 21:51:24.680776395 +0100
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <string.h>
- #include <locale.h>
-+#include <libgen.h> /* for basename(3) */
- 
- #include <attr/attributes.h>
- #include "config.h"
diff --git a/packages/attr/build.sh b/packages/attr/build.sh
index a47e7da84..c49a4d1b8 100644
--- a/packages/attr/build.sh
+++ b/packages/attr/build.sh
@@ -1,10 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://savannah.nongnu.org/projects/attr/
 TERMUX_PKG_DESCRIPTION="Utilities for manipulating filesystem extended attributes"
-TERMUX_PKG_VERSION=2.4.47
-TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/attr/attr-${TERMUX_PKG_VERSION}.src.tar.gz
-TERMUX_PKG_SHA256=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
+TERMUX_PKG_VERSION=2.4.48
+TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/attr/attr-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gettext=no"
-TERMUX_PKG_MAKE_INSTALL_TARGET="install install-lib"
+# TERMUX_PKG_MAKE_INSTALL_TARGET="install install-lib"
 # attr.5 man page is in linux-man-pages:
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man5/attr.5"
diff --git a/packages/attr/include-xattr.h.patch b/packages/attr/include-xattr.h.patch
deleted file mode 100644
index 6d41836b7..000000000
--- a/packages/attr/include-xattr.h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -u -r ../attr-2.4.47/include/xattr.h ./include/xattr.h
---- ../attr-2.4.47/include/xattr.h	2013-05-19 00:53:54.000000000 -0400
-+++ ./include/xattr.h	2016-09-09 09:29:40.387825768 -0400
-@@ -34,29 +34,29 @@
- __BEGIN_DECLS
- 
- extern int setxattr (const char *__path, const char *__name,
--		      const void *__value, size_t __size, int __flags) __THROW;
-+		      const void *__value, size_t __size, int __flags);
- extern int lsetxattr (const char *__path, const char *__name,
--		      const void *__value, size_t __size, int __flags) __THROW;
-+		      const void *__value, size_t __size, int __flags);
- extern int fsetxattr (int __filedes, const char *__name,
--		      const void *__value, size_t __size, int __flags) __THROW;
-+		      const void *__value, size_t __size, int __flags);
- 
- extern ssize_t getxattr (const char *__path, const char *__name,
--				void *__value, size_t __size) __THROW;
-+				void *__value, size_t __size);
- extern ssize_t lgetxattr (const char *__path, const char *__name,
--				void *__value, size_t __size) __THROW;
-+				void *__value, size_t __size);
- extern ssize_t fgetxattr (int __filedes, const char *__name,
--				void *__value, size_t __size) __THROW;
-+				void *__value, size_t __size);
- 
- extern ssize_t listxattr (const char *__path, char *__list,
--				size_t __size) __THROW;
-+				size_t __size);
- extern ssize_t llistxattr (const char *__path, char *__list,
--				size_t __size) __THROW;
-+				size_t __size);
- extern ssize_t flistxattr (int __filedes, char *__list,
--				size_t __size) __THROW;
-+				size_t __size);
- 
--extern int removexattr (const char *__path, const char *__name) __THROW;
--extern int lremovexattr (const char *__path, const char *__name) __THROW;
--extern int fremovexattr (int __filedes,   const char *__name) __THROW;
-+extern int removexattr (const char *__path, const char *__name);
-+extern int lremovexattr (const char *__path, const char *__name);
-+extern int fremovexattr (int __filedes,   const char *__name);
- 
- __END_DECLS
- 
diff --git a/packages/attr/tools-attr.c.patch b/packages/attr/tools-attr.c.patch
new file mode 100644
index 000000000..e4c45fc96
--- /dev/null
+++ b/packages/attr/tools-attr.c.patch
@@ -0,0 +1,11 @@
+diff -u -r ../attr-2.4.48/tools/attr.c ./tools/attr.c
+--- ../attr-2.4.48/tools/attr.c	2018-01-21 05:00:44.000000000 +0000
++++ ./tools/attr.c	2018-06-26 03:18:34.271455876 +0000
+@@ -28,6 +28,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <locale.h>
++#include <libgen.h> /* for basename(3) */
+ 
+ #include <attr/attributes.h>
+