summaryrefslogtreecommitdiff
path: root/source/a/tar
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/tar')
-rw-r--r--source/a/tar/slack-desc8
-rw-r--r--source/a/tar/tar-1.13.bzip2.diff22
-rwxr-xr-xsource/a/tar/tar.SlackBuild20
3 files changed, 34 insertions, 16 deletions
diff --git a/source/a/tar/slack-desc b/source/a/tar/slack-desc
index 573b8901..05cc1f7d 100644
--- a/source/a/tar/slack-desc
+++ b/source/a/tar/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
tar: tar (archiving utility)
tar:
tar: This is the GNU version of tar, an archiving program designed to store
-tar: and extract files from an archive file known as a tarfile. A tarfile
+tar: and extract files from an archive file known as a tarfile. A tarfile
tar: may be made on a tape drive, however, it is also common to write a
tar: tarfile to a normal file.
tar:
diff --git a/source/a/tar/tar-1.13.bzip2.diff b/source/a/tar/tar-1.13.bzip2.diff
index 85c03368..891301d1 100644
--- a/source/a/tar/tar-1.13.bzip2.diff
+++ b/source/a/tar/tar-1.13.bzip2.diff
@@ -1,5 +1,6 @@
---- ./src/tar.c.orig Wed Jul 7 00:49:50 1999
-+++ ./src/tar.c Fri Jul 30 23:00:13 1999
+diff -Nur tar-1.13.orig/src/tar.c tar-1.13/src/tar.c
+--- tar-1.13.orig/src/tar.c 1999-07-07 00:49:50.000000000 -0500
++++ tar-1.13/src/tar.c 2017-12-22 00:39:37.515271544 -0600
@@ -16,6 +16,8 @@
with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
@@ -26,7 +27,14 @@
-z, --gzip, --ungzip filter the archive through gzip\n\
-Z, --compress, --uncompress filter the archive through compress\n\
--use-compress-program=PROG filter through PROG (must accept -d)\n"),
-@@ -416,7 +421,7 @@
+@@ -410,13 +415,13 @@
+ | Parse the options for tar. |
+ `----------------------------*/
+
+-/* Available option letters are DEHIJQY and aejnqy. Some are reserved:
++/* Available option letters are DEHIJQY and aenqy. Some are reserved:
+
+ y per-file gzip compression
Y per-block gzip compression */
#define OPTION_STRING \
@@ -35,14 +43,14 @@
static void
set_subcommand_option (enum subcommand subcommand)
-@@ -787,6 +792,10 @@
- if (add_exclude_file (excluded, optarg, '\n') != 0)
+@@ -788,6 +793,10 @@
FATAL_ERROR ((0, errno, "%s", optarg));
break;
-+
+
+ case 'j':
+ set_use_compress_program_option ("bzip2");
+ break;
-
++
case 'z':
set_use_compress_program_option ("gzip");
+ break;
diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild
index e3a1f7d0..86d97153 100755
--- a/source/a/tar/tar.SlackBuild
+++ b/source/a/tar/tar.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2005-2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,11 @@
# Slackware build script for tar
-VERSION=1.29
-BUILD=${BUILD:-1}
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=tar
+VERSION=1.30
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-tar