From 1129d900f54ffe0376f988e40c6fa446ece7944f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 21 Feb 2019 15:07:26 +0100 Subject: [PATCH 1/5] tar: Strip trailing space --- tar-1.29-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tar-1.29-0.bee b/tar-1.29-0.bee index 2d5a0c419..85dd22344 100755 --- a/tar-1.29-0.bee +++ b/tar-1.29-0.bee @@ -53,7 +53,7 @@ SRCURL[0]="http://ftp.gnu.org/gnu/tar/tar-${PKGVERSION}.tar.xz" mee_configure() { export FORCE_UNSAFE_CONFIGURE=1 - bee_configure + bee_configure } #mee_build() { From 80a5f2b96397d5cfb961e44fd4ed62db1bee264b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 21 Feb 2019 15:07:47 +0100 Subject: [PATCH 2/5] tar: Convert to versionless bee file --- tar-1.29-0.bee => tar.be0 | 2 ++ 1 file changed, 2 insertions(+) rename tar-1.29-0.bee => tar.be0 (99%) diff --git a/tar-1.29-0.bee b/tar.be0 similarity index 99% rename from tar-1.29-0.bee rename to tar.be0 index 85dd22344..4bfd96d32 100755 --- a/tar-1.29-0.bee +++ b/tar.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION tar-1.29-0 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 8a6600995880f24a838dd0afea33be43681e445a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 21 Feb 2019 15:11:44 +0100 Subject: [PATCH 3/5] tar: Securely download source archive over HTTPS --- tar.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tar.be0 b/tar.be0 index 4bfd96d32..e0ff54d80 100755 --- a/tar.be0 +++ b/tar.be0 @@ -9,7 +9,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://ftp.gnu.org/gnu/tar/tar-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.gnu.org/gnu/tar/tar-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 263e2a5fef969cf6347c540acab5dbbe524c67c0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 21 Feb 2019 15:11:51 +0100 Subject: [PATCH 4/5] tar: Update version from 1.29 to 1.31 --- tar.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tar.be0 b/tar.be0 index e0ff54d80..83b2a87cc 100755 --- a/tar.be0 +++ b/tar.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION tar-1.29-0 +# BEE_VERSION tar-1.31-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 686302e091d3d92c98018d50000e3c678ec72442 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 21 Feb 2019 16:27:57 +0100 Subject: [PATCH 5/5] tar: Remove erroneous abort() call See [1][2]. [1]: http://www.linuxfromscratch.org/lfs/view/systemd/chapter06/tar.html [2]: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=85c005ee1345c342f707f3c55317daf6cb050603 --- tar.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tar.be0 b/tar.be0 index 83b2a87cc..f9fdbf43a 100755 --- a/tar.be0 +++ b/tar.be0 @@ -49,9 +49,10 @@ SRCURL[0]="https://ftp.gnu.org/gnu/tar/tar-${PKGVERSION}.tar.xz" # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + start_cmd sed -i 's/abort.*/FALLTHROUGH;/' src/extract.c +} mee_configure() { export FORCE_UNSAFE_CONFIGURE=1