mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

90 lines
3.4 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/tar/tar-bzip2.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
  10. #
  11. # This program is free software; you can redistribute it and/or modify
  12. # it under the terms of the GNU General Public License as published by
  13. # the Free Software Foundation; either version 2 of the License, or
  14. # (at your option) any later version. A copy of the GNU General Public
  15. # License can be found at Documentation/COPYING.
  16. #
  17. # Many people helped and are helping developing ROCK Linux. Please
  18. # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
  19. # file for details.
  20. #
  21. # --- ROCK-COPYRIGHT-NOTE-END ---
  22. Patch by Hiroshi Takekawa to integrate bzip2 compression filter (option -I)
  23. - Clifford
  24. --- ./src/tar.c.orig Wed Jul 7 07:49:50 1999
  25. +++ ./src/tar.c Sun Jul 11 17:25:49 1999
  26. @@ -16,6 +16,11 @@
  27. with this program; if not, write to the Free Software Foundation, Inc.,
  28. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
  29. +/* 13 Oct 97: patched by Hiroshi Takekawa to integrate bzip2 as
  30. + compression filter (option -j, -y and -I) */
  31. +/* 2002-07-16: patched by Anders Karlsson to integrate bzip2 as
  32. + compression filter (with the aditional options -j and -y) */
  33. +
  34. #include "system.h"
  35. #include <getopt.h>
  36. @@ -164,6 +167,12 @@
  37. {"block-number", no_argument, NULL, 'R'},
  38. {"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR},
  39. {"blocking-factor", required_argument, NULL, 'b'},
  40. + {"bzip2", no_argument, NULL, 'j'},
  41. + {"bunzip2", no_argument, NULL, 'j'},
  42. + {"bzip2", no_argument, NULL, 'y'},
  43. + {"bunzip2", no_argument, NULL, 'y'},
  44. + {"bzip2", no_argument, NULL, 'I'},
  45. + {"bunzip2", no_argument, NULL, 'I'},
  46. {"catenate", no_argument, NULL, 'A'},
  47. {"checkpoint", no_argument, &checkpoint_option, 1},
  48. {"compare", no_argument, NULL, 'd'},
  49. @@ -340,6 +345,7 @@
  50. PATTERN at list/extract time, a globbing PATTERN\n\
  51. -o, --old-archive, --portability write a V7 format archive\n\
  52. --posix write a POSIX conformant archive\n\
  53. + -j, -y, -I, --bzip2, --bunzip2 filter the archive through bzip2\n\
  54. -z, --gzip, --ungzip filter the archive through gzip\n\
  55. -Z, --compress, --uncompress filter the archive through compress\n\
  56. --use-compress-program=PROG filter through PROG (must accept -d)\n"),
  57. @@ -416,7 +422,7 @@
  58. Y per-block gzip compression */
  59. #define OPTION_STRING \
  60. - "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
  61. + "-01234567ABC:F:GIK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxyz"
  62. static void
  63. set_subcommand_option (enum subcommand subcommand)
  64. @@ -787,6 +793,18 @@
  65. if (add_exclude_file (excluded, optarg, '\n') != 0)
  66. FATAL_ERROR ((0, errno, "%s", optarg));
  67. break;
  68. +
  69. + case 'j':
  70. + set_use_compress_program_option ("bzip2");
  71. + break;
  72. +
  73. + case 'y':
  74. + set_use_compress_program_option ("bzip2");
  75. + break;
  76. +
  77. + case 'I':
  78. + set_use_compress_program_option ("bzip2");
  79. + break;
  80. case 'z':
  81. set_use_compress_program_option ("gzip");