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.

73 lines
2.6 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 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./src/tar.c.orig 2004-04-04 11:53:30.000000000 +0200
  20. +++ ./src/tar.c 2004-06-24 13:48:06.757203696 +0200
  21. @@ -239,6 +239,8 @@
  22. {"block-number", no_argument, 0, 'R'},
  23. {"blocking-factor", required_argument, 0, 'b'},
  24. {"bzip2", no_argument, 0, 'j'},
  25. + {"bzip2", no_argument, 0, 'y'},
  26. + {"bzip2", no_argument, 0, 'I'},
  27. {"catenate", no_argument, 0, 'A'},
  28. {"checkpoint", no_argument, 0, CHECKPOINT_OPTION},
  29. {"check-links", no_argument, &check_links_option, 1},
  30. @@ -458,7 +460,7 @@
  31. control pax keywords\n\
  32. -V, --label=NAME create archive with volume name NAME\n\
  33. PATTERN at list/extract time, a globbing PATTERN\n\
  34. - -j, --bzip2 filter the archive through bzip2\n\
  35. + -j, -y, -I, --bzip2 filter the archive through bzip2\n\
  36. -z, --gzip, --ungzip filter the archive through gzip\n\
  37. -Z, --compress, --uncompress filter the archive through compress\n\
  38. --use-compress-program=PROG filter through PROG (must accept -d)\n"),
  39. @@ -768,13 +770,15 @@
  40. ignore_zeros_option = true;
  41. break;
  42. - case 'I':
  43. - USAGE_ERROR ((0, 0,
  44. - _("Warning: the -I option is not supported;"
  45. - " perhaps you meant -j or -T?")));
  46. + case 'j':
  47. + set_use_compress_program_option ("bzip2");
  48. break;
  49. - case 'j':
  50. + case 'y':
  51. + set_use_compress_program_option ("bzip2");
  52. + break;
  53. +
  54. + case 'I':
  55. set_use_compress_program_option ("bzip2");
  56. break;
  57. @@ -943,12 +947,6 @@
  58. }
  59. break;
  60. - case 'y':
  61. - USAGE_ERROR ((0, 0,
  62. - _("Warning: the -y option is not supported;"
  63. - " perhaps you meant -j?")));
  64. - break;
  65. -
  66. case 'z':
  67. set_use_compress_program_option ("gzip");
  68. break;