tools/tar: Update to 1.31

Update tar to 1.31
Fixes CVE-2018-20482
Switch to tar.xz tarball
Refresh patches

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>

diff --git a/tools/tar/Makefile b/tools/tar/Makefile
index baa431e2db6b1914ed4fb3fcbe0e3e7ad75d6b39..2565262d4dd8520ee467c261ffff4dd3931b3a8f 100644 (file)
--- a/tools/tar/Makefile
+++ b/tools/tar/Makefile
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tar
 PKG_CPE_ID:=cpe:/a:gnu:tar
 
 PKG_NAME:=tar
 PKG_CPE_ID:=cpe:/a:gnu:tar

-PKG_VERSION:=1.30
+PKG_VERSION:=1.31

 
 

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz

 PKG_SOURCE_URL:=@GNU/tar
 PKG_SOURCE_URL:=@GNU/tar

-PKG_HASH:=87592b86cb037c554375f5868bdd3cc57748aef38d6cb741c81065f0beac63b7
+PKG_HASH:=37f3ef1ceebd8b7e1ebf5b8cc6c65bb8ebf002c7d049032bf456860f25ec2dc1

 
 

-HOST_BUILD_PARALLEL := 1
+HOST_BUILD_PARALLEL:=1

 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 include $(INCLUDE_DIR)/host-build.mk
 

diff --git a/tools/tar/patches/100-symlink-force-root-name.patch b/tools/tar/patches/100-symlink-force-root-name.patch
index 93f889761b716b6c5afca9579ed694a6496c04f8..8a8ebc0c4cfdb4c4af1cbc90f33201274ca736fd 100644 (file)
--- a/tools/tar/patches/100-symlink-force-root-name.patch
+++ b/tools/tar/patches/100-symlink-force-root-name.patch
@@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/src/create.c
 +++ b/src/create.c
 ---
 --- a/src/create.c
 +++ b/src/create.c

-@@ -544,17 +544,8 @@ write_gnu_long_link (struct tar_stat_inf
+@@ -543,17 +543,8 @@ write_gnu_long_link (struct tar_stat_inf

    union block *header;
  
    header = start_private_header ("././@LongLink", size, 0);
    union block *header;
  
    header = start_private_header ("././@LongLink", size, 0);

diff --git a/tools/tar/patches/110-symlink-force-permissions.patch b/tools/tar/patches/110-symlink-force-permissions.patch
index 6fb799bc0a3e0ee54f6966d6616efb1b8e96d6ff..e9a32f7d1355d74404f7223b785a30c06d4ae94e 100644 (file)
--- a/tools/tar/patches/110-symlink-force-permissions.patch
+++ b/tools/tar/patches/110-symlink-force-permissions.patch
@@ -1,6 +1,6 @@
 --- a/src/create.c
 +++ b/src/create.c
 --- a/src/create.c
 +++ b/src/create.c

-@@ -1853,6 +1853,7 @@ dump_file0 (struct tar_stat_info *st, ch
+@@ -1852,6 +1852,7 @@ dump_file0 (struct tar_stat_info *st, ch

  #ifdef HAVE_READLINK
    else if (S_ISLNK (st->stat.st_mode))
      {
  #ifdef HAVE_READLINK
    else if (S_ISLNK (st->stat.st_mode))
      {