fake
20 years ago
11 changed files with 80 additions and 266 deletions
Split View
Diff Options
-
+3 -0package/base/dietlibc/parse-config-9
-
+0 -52package/base/dietlibc/pkg_patch/pkg_tar.patch
-
+14 -0package/base/tar/compar_does_not_need_fd.h.patch
-
+10 -0package/base/tar/fix_getdate_c.patch
-
+0 -33package/base/tar/fix_no_ascii_char.patch
-
+0 -33package/base/tar/no_rmt.patch
-
+0 -63package/base/tar/no_same_owner.patch
-
+10 -0package/base/tar/read-full-records.patch
-
+40 -76package/base/tar/tar-bzip2.patch
-
+1 -7package/base/tar/tar.conf
-
+2 -2package/base/tar/tar.desc
@ -1,52 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/dietlibc/pkg_patch/pkg_tar.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./lib/msleep.c.orig Wed May 1 14:02:11 2002
|
|||
+++ ./lib/msleep.c Wed May 1 14:02:59 2002
|
|||
@@ -35,9 +35,6 @@
|
|||
#endif |
|||
|
|||
#if HAVE_POLL |
|||
-# if HAVE_STROPTS_H
|
|||
-# include <stropts.h>
|
|||
-# endif
|
|||
# if HAVE_POLL_H |
|||
# include <sys/types.h> |
|||
# include <poll.h> |
|||
--- ./configure.orig 2002-10-09 12:39:31.000000000 +0200
|
|||
+++ ./configure 2002-10-09 12:39:35.000000000 +0200
|
|||
@@ -2073,6 +2073,7 @@
|
|||
FILE *f=fopen("conftestval", "w"); |
|||
if (!f) exit(1); |
|||
fprintf(f, "%d\n", sizeof(unsigned long)); |
|||
+ fclose(f);
|
|||
exit(0); |
|||
} |
|||
EOF |
|||
--- ./configure~ Mon Jan 6 21:29:53 2003
|
|||
+++ ./configure Mon Jan 6 21:37:05 2003
|
|||
@@ -2134,7 +2134,7 @@
|
|||
#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long |
|||
EOF |
|||
|
|||
-
|
|||
+ac_cv_header_sgtty_h=no
|
|||
|
|||
for ac_hdr in fcntl.h limits.h linux/fd.h memory.h net/errno.h poll.h \ |
|||
sgtty.h string.h stropts.h \ |
|||
@ -0,0 +1,14 @@ |
|||
--- ./src/compare.c.orig 2004-06-24 13:49:08.444825752 +0200
|
|||
+++ ./src/compare.c 2004-06-24 13:47:15.575984424 +0200
|
|||
@@ -31,9 +31,11 @@
|
|||
}; |
|||
#endif |
|||
|
|||
+#if 0
|
|||
#if HAVE_LINUX_FD_H |
|||
# include <linux/fd.h> |
|||
#endif |
|||
+#endif
|
|||
|
|||
#include <quotearg.h> |
|||
|
|||
@ -0,0 +1,10 @@ |
|||
--- ./lib/getdate.c.orig 2004-06-24 13:40:15.672819408 +0200
|
|||
+++ ./lib/getdate.c 2004-06-24 13:43:11.842037616 +0200
|
|||
@@ -54,6 +54,7 @@
|
|||
#endif |
|||
|
|||
#include <alloca.h> |
|||
+#include <stdio.h>
|
|||
|
|||
/* Since the code of getdate.y is not included in the Emacs executable |
|||
itself, there is no need to #define static in this file. Even if |
|||
@ -1,33 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/tar/fix_no_ascii_char.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./tests/genfile.c.orig 2003-07-27 23:44:12.000000000 -0400
|
|||
+++ ./tests/genfile.c 2003-07-27 23:44:27.000000000 -0400
|
|||
@@ -164,7 +164,7 @@
|
|||
stdout); |
|||
fputs (_("\ |
|||
\n\ |
|||
-Written by François Pinard <pinard@iro.umontreal.ca>.\n"),
|
|||
+Written by Francois Pinard <pinard@iro.umontreal.ca>.\n"),
|
|||
stdout); |
|||
exit (EXIT_SUCCESS); |
|||
} |
|||
@ -1,33 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/tar/no_rmt.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./src/Makefile.in.orig 2003-01-07 18:04:19.000000000 +0100
|
|||
+++ ./src/Makefile.in 2003-01-07 18:04:27.000000000 +0100
|
|||
@@ -112,7 +112,7 @@
|
|||
AUTOMAKE_OPTIONS = gnits ansi2knr |
|||
bin_PROGRAMS = tar |
|||
libexec_PROGRAMS = @RMT@ |
|||
-EXTRA_PROGRAMS = rmt
|
|||
+EXTRA_PROGRAMS =
|
|||
|
|||
noinst_HEADERS = arith.h common.h rmt.h system.h tar.h |
|||
rmt_SOURCES = rmt.c |
|||
@ -1,63 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/tar/no_same_owner.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./src/extract.c.orig Mon Jun 3 14:56:04 2002
|
|||
+++ ./src/extract.c Mon Jun 3 14:56:57 2002
|
|||
@@ -162,7 +162,7 @@
|
|||
extract as the original owner. Or else, if we are running as a user, |
|||
leave the owner and group as they are, so we extract as that user. */ |
|||
|
|||
- if (we_are_root || same_owner_option)
|
|||
+ if (!no_same_owner_option && (we_are_root || same_owner_option))
|
|||
{ |
|||
#if HAVE_LCHOWN |
|||
|
|||
--- ./src/common.h.orig Mon Jun 3 14:57:49 2002
|
|||
+++ ./src/common.h Mon Jun 3 15:13:56 2002
|
|||
@@ -196,6 +196,9 @@
|
|||
GLOBAL int no_recurse_option; |
|||
|
|||
/* Boolean value. */ |
|||
+GLOBAL int no_same_owner_option;
|
|||
+
|
|||
+/* Boolean value. */
|
|||
GLOBAL int numeric_owner_option; |
|||
|
|||
/* Boolean value. */ |
|||
--- ./src/tar.c.orig Mon Jun 3 15:13:28 2002
|
|||
+++ ./src/tar.c Mon Jun 3 15:15:53 2002
|
|||
@@ -205,6 +205,7 @@
|
|||
{"newer-mtime", required_argument, NULL, NEWER_MTIME_OPTION}, |
|||
{"null", no_argument, NULL, NULL_OPTION}, |
|||
{"no-recursion", no_argument, NULL, NO_RECURSE_OPTION}, |
|||
+ {"no-same-owner", no_argument, &no_same_owner_option, 1},
|
|||
{"numeric-owner", no_argument, &numeric_owner_option, 1}, |
|||
{"old-archive", no_argument, NULL, 'o'}, |
|||
{"one-file-system", no_argument, NULL, 'l'}, |
|||
@@ -305,6 +306,7 @@
|
|||
--atime-preserve don't change access times on dumped files\n\ |
|||
-m, --modification-time don't extract file modified time\n\ |
|||
--same-owner try extracting files with the same ownership\n\ |
|||
+ --no-same-owner don't extract files with the same ownership\n\
|
|||
--numeric-owner always use numbers for user/group names\n\ |
|||
-p, --same-permissions extract all protection information\n\ |
|||
--preserve-permissions same as -p\n\ |
|||
@ -0,0 +1,10 @@ |
|||
--- ./src/buffer.c.orig 2004-07-31 13:55:14.000000000 +0200
|
|||
+++ ./src/buffer.c 2004-07-31 13:55:48.000000000 +0200
|
|||
@@ -293,7 +293,6 @@
|
|||
{ |
|||
case ACCESS_READ: |
|||
child_pid = sys_child_open_for_uncompress (); |
|||
- read_full_records_option = false;
|
|||
break; |
|||
|
|||
case ACCESS_WRITE: |
|||
@ -1,90 +1,54 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/tar/tar-bzip2.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
|
|||
Patch by Hiroshi Takekawa to integrate bzip2 compression filter (option -I) |
|||
|
|||
- Clifford |
|||
|
|||
--- ./src/tar.c.orig Wed Jul 7 07:49:50 1999
|
|||
+++ ./src/tar.c Sun Jul 11 17:25:49 1999
|
|||
@@ -16,6 +16,11 @@
|
|||
with this program; if not, write to the Free Software Foundation, Inc., |
|||
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ |
|||
|
|||
+/* 13 Oct 97: patched by Hiroshi Takekawa to integrate bzip2 as
|
|||
+ compression filter (option -j, -y and -I) */
|
|||
+/* 2002-07-16: patched by Anders Karlsson to integrate bzip2 as
|
|||
+ compression filter (with the aditional options -j and -y) */
|
|||
+
|
|||
#include "system.h" |
|||
|
|||
#include <getopt.h> |
|||
@@ -164,6 +167,12 @@
|
|||
{"block-number", no_argument, NULL, 'R'}, |
|||
{"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR}, |
|||
{"blocking-factor", required_argument, NULL, 'b'}, |
|||
+ {"bzip2", no_argument, NULL, 'j'},
|
|||
+ {"bunzip2", no_argument, NULL, 'j'},
|
|||
+ {"bzip2", no_argument, NULL, 'y'},
|
|||
+ {"bunzip2", no_argument, NULL, 'y'},
|
|||
+ {"bzip2", no_argument, NULL, 'I'},
|
|||
+ {"bunzip2", no_argument, NULL, 'I'},
|
|||
{"catenate", no_argument, NULL, 'A'}, |
|||
{"checkpoint", no_argument, &checkpoint_option, 1}, |
|||
{"compare", no_argument, NULL, 'd'}, |
|||
@@ -340,6 +345,7 @@
|
|||
--- ./src/tar.c.orig 2004-04-04 11:53:30.000000000 +0200
|
|||
+++ ./src/tar.c 2004-06-24 13:48:06.757203696 +0200
|
|||
@@ -239,6 +239,8 @@
|
|||
{"block-number", no_argument, 0, 'R'}, |
|||
{"blocking-factor", required_argument, 0, 'b'}, |
|||
{"bzip2", no_argument, 0, 'j'}, |
|||
+ {"bzip2", no_argument, 0, 'y'},
|
|||
+ {"bzip2", no_argument, 0, 'I'},
|
|||
{"catenate", no_argument, 0, 'A'}, |
|||
{"checkpoint", no_argument, 0, CHECKPOINT_OPTION}, |
|||
{"check-links", no_argument, &check_links_option, 1}, |
|||
@@ -458,7 +460,7 @@
|
|||
control pax keywords\n\ |
|||
-V, --label=NAME create archive with volume name NAME\n\ |
|||
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, -y, -I, --bzip2, --bunzip2 filter the archive through bzip2\n\
|
|||
- -j, --bzip2 filter the archive through bzip2\n\
|
|||
+ -j, -y, -I, --bzip2 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"), |
|||
@@ -416,7 +422,7 @@
|
|||
Y per-block gzip compression */ |
|||
|
|||
#define OPTION_STRING \ |
|||
- "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
|
|||
+ "-01234567ABC:F:GIK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxyz"
|
|||
|
|||
static void |
|||
set_subcommand_option (enum subcommand subcommand) |
|||
@@ -787,6 +793,18 @@
|
|||
if (add_exclude_file (excluded, optarg, '\n') != 0) |
|||
FATAL_ERROR ((0, errno, "%s", optarg)); |
|||
@@ -768,13 +770,15 @@
|
|||
ignore_zeros_option = true; |
|||
break; |
|||
+
|
|||
|
|||
- case 'I':
|
|||
- USAGE_ERROR ((0, 0,
|
|||
- _("Warning: the -I option is not supported;"
|
|||
- " perhaps you meant -j or -T?")));
|
|||
+ case 'j':
|
|||
+ set_use_compress_program_option ("bzip2");
|
|||
+ break;
|
|||
+
|
|||
break; |
|||
|
|||
- case 'j':
|
|||
+ case 'y':
|
|||
+ set_use_compress_program_option ("bzip2");
|
|||
+ break;
|
|||
+ break;
|
|||
+
|
|||
+ case 'I':
|
|||
+ set_use_compress_program_option ("bzip2");
|
|||
+ break;
|
|||
set_use_compress_program_option ("bzip2"); |
|||
break; |
|||
|
|||
@@ -943,12 +947,6 @@
|
|||
} |
|||
break; |
|||
|
|||
- case 'y':
|
|||
- USAGE_ERROR ((0, 0,
|
|||
- _("Warning: the -y option is not supported;"
|
|||
- " perhaps you meant -j?")));
|
|||
- break;
|
|||
-
|
|||
case 'z': |
|||
set_use_compress_program_option ("gzip"); |
|||
break; |
|||