summaryrefslogtreecommitdiff
path: root/source/a/tar
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/tar')
-rwxr-xr-xsource/a/tar/tar.SlackBuild23
-rw-r--r--source/a/tar/tar.nolonezero.diff31
2 files changed, 40 insertions, 14 deletions
diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild
index 86d97153..3b21c7a8 100755
--- a/source/a/tar/tar.SlackBuild
+++ b/source/a/tar/tar.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=tar
VERSION=1.30
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
@@ -50,6 +50,27 @@ fi
TMP=${TMP:-/tmp}
PKG=$TMP/package-tar
+# Don't use icecream:
+for path_element in $(echo $PATH | tr ':' '\n') ; do
+ if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
+ continue
+ fi
+ if [ -z "$REVERSE_PATH" ]; then
+ REVERSE_PATH="$path_element"
+ else
+ REVERSE_PATH="${REVERSE_PATH}:$path_element"
+ fi
+done
+for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
+ if [ -z "$FORWARD_PATH" ]; then
+ FORWARD_PATH="$path_element"
+ else
+ FORWARD_PATH="${FORWARD_PATH}:$path_element"
+ fi
+done
+PATH=$FORWARD_PATH
+unset FORWARD_PATH REVERSE_PATH
+
rm -rf $PKG
mkdir -p $TMP $PKG
diff --git a/source/a/tar/tar.nolonezero.diff b/source/a/tar/tar.nolonezero.diff
index c47e067f..52967972 100644
--- a/source/a/tar/tar.nolonezero.diff
+++ b/source/a/tar/tar.nolonezero.diff
@@ -1,26 +1,31 @@
-diff -Nur tar-1.27.1.orig/src/list.c tar-1.27.1/src/list.c
---- tar-1.27.1.orig/src/list.c 2013-03-14 15:18:10.000000000 -0500
-+++ tar-1.27.1/src/list.c 2014-07-26 20:42:16.613004098 -0500
-@@ -211,6 +211,14 @@
+--- ./src/list.c.orig 2017-12-16 15:23:12.000000000 -0600
++++ ./src/list.c 2018-09-06 16:51:52.982740004 -0500
+@@ -242,15 +242,22 @@
if (!ignore_zeros_option)
{
+- char buf[UINTMAX_STRSIZE_BOUND];
+
-+ /*
++ /*
+ * According to POSIX tar specs, this is wrong, but on the web
+ * there are some tar specs that can trigger this, and some tar
+ * implementations create tars according to that spec. For now,
+ * let's not be pedantic about issuing the warning.
-+ */
-+#if 0
- char buf[UINTMAX_STRSIZE_BOUND];
++ *
++ * char buf[UINTMAX_STRSIZE_BOUND]; */
status = read_header (&current_header, &current_stat_info,
-@@ -220,6 +228,7 @@
- WARNOPT (WARN_ALONE_ZERO_BLOCK,
- (0, 0, _("A lone zero block at %s"),
- STRINGIFY_BIGINT (current_block_ordinal (), buf)));
-+#endif
+ read_header_auto);
+- if (status == HEADER_ZERO_BLOCK)
+- break;
+- WARNOPT (WARN_ALONE_ZERO_BLOCK,
+- (0, 0, _("A lone zero block at %s"),
+- STRINGIFY_BIGINT (current_block_ordinal (), buf)));
++ /* if (status == HEADER_ZERO_BLOCK)
++ * break;
++ * WARNOPT (WARN_ALONE_ZERO_BLOCK,
++ * (0, 0, _("A lone zero block at %s"),
++ * STRINGIFY_BIGINT (current_block_ordinal (), buf))); */
break;
}
status = prev_status;