From 83c6011cae23291639fa1128d5fabe66a2ae8aeb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Sat, 23 Feb 2019 16:06:57 -0300
Subject: [PATCH] recipes: tools/tar: upgraded to version 1.32

---
 .../tar/85c005ee1345c342f707f3c55317daf6cb050603   | 33 ----------------------
 recipes/tools/tar/recipe                           |  8 ++----
 sources/SOURCELIST.txt                             |  2 +-
 sources/tar-1.31.tar.bz2.sha256                    |  1 -
 sources/tar-1.32.tar.bz2.sha256                    |  1 +
 5 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 patches/tar/85c005ee1345c342f707f3c55317daf6cb050603
 delete mode 100644 sources/tar-1.31.tar.bz2.sha256
 create mode 100644 sources/tar-1.32.tar.bz2.sha256

diff --git a/patches/tar/85c005ee1345c342f707f3c55317daf6cb050603 b/patches/tar/85c005ee1345c342f707f3c55317daf6cb050603
deleted file mode 100644
index 9e255df5..00000000
--- a/patches/tar/85c005ee1345c342f707f3c55317daf6cb050603
+++ /dev/null
@@ -1,33 +0,0 @@
-From 85c005ee1345c342f707f3c55317daf6cb050603 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org.ua>
-Date: Thu, 10 Jan 2019 18:18:49 +0200
-Subject: Remove erroneous abort() call
-
-The call was introduced by commit ccef8581. It caused tar to abort
-on perfectly normal operations, like untarring archives containing
-./ with the -U option,
-
-See http://lists.gnu.org/archive/html/bug-tar/2019-01/msg00019.html
-for details.
-
-* src/extract.c (maybe_recoverable): Remove misplaced call to abort().
----
- src/extract.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/extract.c b/src/extract.c
-index 090b866..8276f8f 100644
---- a/src/extract.c
-+++ b/src/extract.c
-@@ -787,7 +787,7 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made)
- 	case UNLINK_FIRST_OLD_FILES:
- 	  break;
- 	}
--      abort (); /* notreached */
-+      FALLTHROUGH;
- 
-     case ENOENT:
-       /* Attempt creating missing intermediate directories.  */
--- 
-cgit v1.0-41-gc330
-
diff --git a/recipes/tools/tar/recipe b/recipes/tools/tar/recipe
index 4c750ad7..d4eaad73 100644
--- a/recipes/tools/tar/recipe
+++ b/recipes/tools/tar/recipe
@@ -16,8 +16,8 @@
 # limitations under the License.
 
 program=tar
-version=1.31
-release=3
+version=1.32
+release=1
 
 # Set 'outdir' for a nice and well-organized output directory
 outdir="${outdir}/${arch}/tools"
@@ -56,10 +56,6 @@ build()
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
-    # A regression for tar 1.31+:
-    # http://git.savannah.nongnu.org/cgit/tar.git/commit/?id=85c005ee1345c342f707f3c55317daf6cb050603
-    patch -p1 < "${worktree}/patches/tar/85c005ee1345c342f707f3c55317daf6cb050603"
-
     ./configure CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS -static" \
     FORCE_UNSAFE_CONFIGURE="1" \
      $configure_args \
diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt
index 745d74e6..21800207 100644
--- a/sources/SOURCELIST.txt
+++ b/sources/SOURCELIST.txt
@@ -123,7 +123,7 @@ http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.gz
 http://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
 http://ftp.gnu.org/gnu/nettle/nettle-3.4.1.tar.gz
 http://ftp.gnu.org/gnu/sed/sed-4.7.tar.xz
-http://ftp.gnu.org/gnu/tar/tar-1.31.tar.bz2
+http://ftp.gnu.org/gnu/tar/tar-1.32.tar.bz2
 http://ftp.gnu.org/gnu/texinfo/texinfo-6.6.tar.gz
 http://ftp.gnu.org/gnu/which/which-2.21.tar.gz
 http://ftp.gnu.org/pub/gnu/clisp/release/2.49/clisp-2.49.tar.bz2
diff --git a/sources/tar-1.31.tar.bz2.sha256 b/sources/tar-1.31.tar.bz2.sha256
deleted file mode 100644
index 71cd2bf5..00000000
--- a/sources/tar-1.31.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-577bd4463eea103bdfc662fc385789e2228dbeb399a1d0b98571ed9ce044f763  tar-1.31.tar.bz2
diff --git a/sources/tar-1.32.tar.bz2.sha256 b/sources/tar-1.32.tar.bz2.sha256
new file mode 100644
index 00000000..7948255b
--- /dev/null
+++ b/sources/tar-1.32.tar.bz2.sha256
@@ -0,0 +1 @@
+e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566  tar-1.32.tar.bz2
-- 
2.11.4.GIT