mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
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. */
|
|
|
|
+/* Patched to integrate bzip2 as compression filter (option -j) */
|
|
+
|
|
#include "system.h"
|
|
|
|
#include <getopt.h>
|
|
@@ -164,6 +166,8 @@
|
|
{"block-number", no_argument, NULL, 'R'},
|
|
{"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR},
|
|
{"blocking-factor", required_argument, NULL, 'b'},
|
|
+ {"bzip2", required_argument, NULL, 'j'},
|
|
+ {"bunzip2", required_argument, NULL, 'j'},
|
|
{"catenate", no_argument, NULL, 'A'},
|
|
{"checkpoint", no_argument, &checkpoint_option, 1},
|
|
{"compare", no_argument, NULL, 'd'},
|
|
@@ -340,6 +344,7 @@
|
|
PATTERN at list/extract time, a globbing PATTERN\n\
|
|
-o, --old-archive, --portability write a V7 format archive\n\
|
|
--posix write a POSIX conformant archive\n\
|
|
+ -j, --bzip2, --bunzip2 filter the archive through bzip2\n\
|
|
-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"),
|
|
@@ -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 \
|
|
- "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
|
|
+ "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxz"
|
|
|
|
static void
|
|
set_subcommand_option (enum subcommand subcommand)
|
|
@@ -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;
|