[arch-commits] Commit in tar/trunk (PKGBUILD tar.1 tar.install)

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Dec 22 13:09:01 UTC 2008


    Date: Monday, December 22, 2008 @ 08:09:01
  Author: andyrtr
Revision: 22149

upgpkg: tar 1.20-3
    add info files; update man-page from Debian - solving FS#12188

Added:
  tar/trunk/tar.install
Modified:
  tar/trunk/PKGBUILD
  tar/trunk/tar.1

-------------+
 PKGBUILD    |   12 -
 tar.1       |  494 +++++++++++++++++++++++++++++-----------------------------
 tar.install |   19 ++
 3 files changed, 280 insertions(+), 245 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-22 12:33:23 UTC (rev 22148)
+++ PKGBUILD	2008-12-22 13:09:01 UTC (rev 22149)
@@ -1,17 +1,19 @@
 # $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
 pkgname=tar
 pkgver=1.20
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility used to store, backup, and transport files"
 arch=('i686' 'x86_64')
 license=('GPL3')
 groups=('base')
+install=tar.install
 url="http://www.gnu.org/software/tar/tar.html"
-depends=('glibc' 'bash')
+depends=('glibc' 'bash' 'texinfo')
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 tar.1)
 md5sums=('1a7e17f27abf583b3b0bc059a827e68b'
-         'a5f8c5da7a9465ea1978145f3ef0610c')
+         'c7321066921766c14c4b23e3d598faaa')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -19,4 +21,6 @@
   make || return 1
   make DESTDIR=$startdir/pkg install
   install -D -m644 ../tar.1 $startdir/pkg/usr/share/man/man1/tar.1
+
+  rm -rf ${pkgdir}/usr/share/info/dir
 }

Modified: tar.1
===================================================================
--- tar.1	2008-12-22 12:33:23 UTC (rev 22148)
+++ tar.1	2008-12-22 13:09:01 UTC (rev 22149)
@@ -1,5 +1,5 @@
 .\" @(#)tar.1 1.11.1 93/19/22 PJV;
-.TH TAR 1 "22 September 1993"
+.TH TAR 1 "29 Aug 2007"
 .SH NAME
 tar \- The GNU version of the tar archiving utility
 .SH SYNOPSIS
@@ -7,155 +7,9 @@
 [
 .B \-
 ]
-.B A --catenate --concatenate \||\| c --create \||\| d --diff --compare \||\| r --append \||\| t --list \||\| u --update \||\| x -extract --get
-[
-.B --atime-preserve
-]
-[
-.B -b, --block-size N
-]
-[
-.B -B, --read-full-blocks
-]
-[
-.B -C, --directory DIR
-]
-[
-.B --checkpoint	
-]
-[
-.B -f, --file [HOSTNAME:]F
-]
-[
-.B --force-local	
-]
-[
-.B -F, --info-script F --new-volume-script F
-]
-[
-.B -G, --incremental
-]
-[
-.B -g, --listed-incremental F
-]
-[
-.B -h, --dereference
-]
-[
-.B -i, --ignore-zeros
-]
-[
-.B -j, --bzip2
-]
-[
-.B --ignore-failed-read
-]
-[
-.B -k, --keep-old-files
-]
-[
-.B -K, --starting-file F
-]
-[
-.B -l, --one-file-system
-]
-[
-.B -L, --tape-length N
-]
-[
-.B -m, --modification-time
-]
-[
-.B -M, --multi-volume
-]
-[
-.B -N, --after-date DATE, --newer DATE
-]
-[
-.B -o, --old-archive, --portability
-]
-[
-.B -O, --to-stdout
-]
-[
-.B -p, --same-permissions, --preserve-permissions
-]
-[
-.B -P, --absolute-names
-]
-[
-.B --preserve	
-]
-[
-.B -R, --record-number
-]
-[
-.B --remove-files
-]
-[
-.B -s, --same-order, --preserve-order
-]
-[
-.B --same-owner
-]
-[
-.B --numeric-owner
-]
-[
-.B -S, --sparse
-]
-[
-.B -T, --files-from F
-]
-[
-.B --null	
-]
-[
-.B --totals	
-]
-[
-.B -v, --verbose
-]
-[
-.B -V, --label NAME
-]
-[
-.B --version	
-]
-[
-.B -w, --interactive, --confirmation
-]
-[
-.B -W, --verify	
-]
-[
-.B --exclude=FILE
-]
-[
-.B -X, --exclude-from FILE
-]
-[
-.B -Z, --compress, --uncompress
-]
-[
-.B -z, --gzip, --ungzip	
-]
-[
-.B --use-compress-program PROG
-]
-[
-.B --block-compress
-]
-[
-.B --rsh-command=CMD
-]
-[
-.B -[0-7][lmh]	
-]
-.TP
-.I filename1 [ filename2, ... filenameN ] 
-.TP
-.I directory1 [ directory2, ...directoryN ]
+.B A \-\-catenate \-\-concatenate \||\| c \-\-create \||\| d \-\-diff \-\-compare \||\| \-\-delete \||\| r \-\-append \||\| t \-\-list \||\| u \-\-update \||\| x \-\-extract \-\-get 
+.I [ options ]
+.I pathname [ pathname ... ] 
 .SH DESCRIPTION
 .LP
 This manual page documents the GNU version of
@@ -181,196 +35,354 @@
 included in the archive.
 .SH EXAMPLES
 .TP
-.B tar -xvvf foo.tar
+.B tar \-xvvf foo.tar
 extract foo.tar
 .TP
-.B tar -xvvzf foo.tar.gz
+.B tar \-xvvzf foo.tar.gz
 extract gzipped foo.tar.gz
 .TP
-.B tar -cvvf foo.tar foo/
+.B tar \-cvvf foo.tar foo/
 tar contents of folder foo in foo.tar
 .SH "FUNCTION LETTERS"
 .TP
 .B One of the following options must be used:
 .TP
-.B -A, --catenate, --concatenate
+.B \-A, \-\-catenate, \-\-concatenate
 append tar files to an archive
 .TP
-.B -c, --create	
+.B \-c, \-\-create	
 create a new archive
 .TP
-.B -d, --diff, --compare
+.B \-d, \-\-diff, \-\-compare
 find differences between archive and file system
 .TP
-.B --delete		
+.B \-\-delete		
 delete from the archive (not for use on mag tapes!)
 .TP
-.B -r, --append		
+.B \-r, \-\-append		
 append files to the end of an archive
 .TP
-.B -t, --list		
+.B \-t, \-\-list		
 list the contents of an archive
 .TP
-.B -u, --update		
+.B \-u, \-\-update		
 only append files that are newer than copy in archive
 .TP
-.B -x, --extract, --get		
+.B \-x, \-\-extract, \-\-get		
 extract files from an archive
 .SH "OTHER OPTIONS"
 .TP
-.B --atime-preserve	
+.B \-\-allow\-name\-mangling
+re-enable handling of GNUTYPE_NAMES which is now disabled by default
+.TP
+.B \-\-anchored	
+force exclusion patterns to match initial subsequences
+.TP
+.B \-\-atime\-preserve	
 don't change access times on dumped files
 .TP
-.B -b, --block-size N	
-block size of Nx512 bytes (default N=20)
+.B \-a, \-\-auto\-compress
+with \-\-create, selects compression algorithm basing on the suffix
+of the archive file name
 .TP
-.B -B, --read-full-blocks	
+.B \-b, \-\-blocking\-factor N
+use record size of Nx512 bytes (default N=20)
+.TP
+.B \-B, \-\-read\-full\-records
 reblock as we read (for reading 4.2BSD pipes)
+.TP
+.B \-\-backup[\=TYPE]
+back up files instead of overwriting (TYPE=numbered, existing, simple)
 .TP 
-.B -C, --directory DIR	
+.B \-C, \-\-directory DIR	
 change to directory DIR
 .TP 
-.B --checkpoint		
-print directory names while reading the archive
+.B \-\-checkpoint		
+print periodic checkpoints
 .TP
-.B -f, --file [HOSTNAME:]F	
-use archive file or device F (default "-", meaning stdin/stdout)
+.B \-\-checkpoint\-action
+this action allows to specify an action to be executed upon hitting a
+checkpoint.  Recognized actions are: dot, echo (the default),
+echo\=string, ttyout\=string, exec\=cmdline, and sleep\=value.  Any number
+of `\-\-checkpoint\-action' options can be specified, the actions will be
+executed in order of their appearance in the command line.
 .TP
-.B --force-local		
-archive file is local even if has a colon
+.B \-\-check\-device
+enables comparing device numbers.  This is the default.
+.TP
+.B \-\-no\-check\-device
+disables comparing device numbers during preparatory stage of an 
+incremental dump.  
+This allows to avoid creating full dumps if the device numbers change 
+(e.g. when using an LVM snapshot)
+.TP
+.B \-\-exclude=PATTERN
+exclude files matching PATTERN
+.TP
+.B \-f, \-\-file [HOSTNAME:]F	
+use archive file or device F (otherwise value of TAPE environment variable; if unset, "\-", meaning stdin/stdout)
 .TP 
-.B -F, --info-script F --new-volume-script F 
-run script at end of each tape (implies -M)
+.B \-F, \-\-info\-script F, \-\-new\-volume\-script F 
+run script at end of each tape (implies \-M)
 .TP
-.B -G, --incremental	
+.B \-\-force\-local		
+archive file is local even if it has a colon
+.TP
+.B \-G, \-\-incremental	
 create/list/extract old GNU-format incremental backup
 .TP
-.B -g, --listed-incremental F 
+.B \-g, \-\-listed\-incremental F 
 create/list/extract new GNU-format incremental backup
+.TP
+.B \-\-group G
+set group to G while adding files
 .TP 
-.B -h, --dereference	
+.B \-h, \-\-dereference	
 don't dump symlinks; dump the files they point to
 .TP
-.B -i, --ignore-zeros	
+.B \-\-hard\-dereference
+during archive creation, dereferences hard links and stores the files
+they refer to, instead of creating usual hard link members (type '1')
+.TP
+.B \-\-help
+print help message
+.TP
+.B \-i, \-\-ignore\-zeros	
 ignore blocks of zeros in archive (normally mean EOF)
 .TP
-.B -j, --bzip2
-filter archive through bzip2, use to decompress .bz2 files
+.B \-\-ignore\-case
+ignore case when excluding files
 .TP
-.B --ignore-failed-read	
+.B \-\-ignore\-failed\-read	
 don't exit with non-zero status on unreadable files
 .TP
-.B -k, --keep-old-files	
+.B \-j, \-\-bzip2
+filter archive through bzip2, use to decompress .bz2 files.
+WARNING: some previous versions of tar used option \-I to 
+filter through bzip2.  When writing scripts, use \-\-bzip2 
+instead of \-j so that both older and newer tar versions
+will work.
+.TP
+.B \-k, \-\-keep\-old\-files	
 keep existing files; don't overwrite them from archive
 .TP
-.B -K, --starting-file F	
+.B \-K, \-\-starting\-file F	
 begin at file F in the archive
 .TP
-.B -l, --one-file-system	
-stay in local file system when creating an archive
+.B \-\-lzma
+selects LZMA compression algorithm
 .TP
-.B -L, --tape-length N	
+.B \-l, \-\-check\-links
+print a message if not all links are dumped
+.TP
+.B \-L, \-\-tape\-length N	
 change tapes after writing N*1024 bytes
 .TP
-.B -m, --modification-time	
+.B \-m, \-\-touch
 don't extract file modified time
 .TP
-.B -M, --multi-volume	
+.BI \-\-transform " expr"
+applies filename transformations.  
+The argument to this option can be a list of replace expressions, separated
+by semicolon (as in `sed').
+Filename transformations are applied to symbolic link targets during both
+creation and extraction.
+This option may be specified any number of
+times, the specified transofrmations will be applied in turn.
+.TP
+.B \-M, \-\-multi\-volume	
 create/list/extract multi-volume archive
 .TP
-.B -N, --after-date DATE, --newer DATE	
+.B \-\-mode M
+set permissions to M while adding files
+.TP
+.B \-N, \-\-after\-date DATE, \-\-newer DATE
 only store files newer than DATE
 .TP
-.B -o, --old-archive, --portability	
-write a V7 format archive, rather than ANSI format
+.B \-\-newer\-mtime DATE
+only store files whose contents have changed after DATE
 .TP
-.B -O, --to-stdout		
+.B \-\-no\-anchored
+allow exclusion patterns to match any substring (the default)
+.TP
+.B \-\-no\-ignore\-case
+match patterns case sensitively (the default)
+.TP
+.B \-\-no\-recursion
+do not recurse into subdirectories
+.TP
+.B \-o, \-\-no\-same\-owner
+extract files with owner set to current user (the default for non-root
+users)
+.TP
+.B \-\-no\-same\-permissions
+apply umask to extracted files (the default for non-root users)
+.TP
+.B \-\-no\-wildcards
+do not use wildcards when excluding files
+.TP
+.B \-\-no\-wildcards\-match\-slash
+don't let wildcards match "/" when excluding files
+.TP
+.B \-\-null
+for \-T, use "NUL" instead of newline as filename terminator
+.TP
+.B \-\-numeric\-owner
+always use numbers for user/group names
+.TP
+.B \-\-old\-archive, \-\-portability	
+write a V7 format archive, rather than ANSI format.  These options are
+deprecated, please use 
+.B \-\-format\=v7
+instead.
+.TP
+.B \-\-one\-file\-system	
+stay in local file system when creating an archive
+.TP
+.B \-\-owner O
+set owner to O while adding files
+.TP 
+.B \-O, \-\-to\-stdout		
 extract files to standard output
 .TP
-.B -p, --same-permissions, --preserve-permissions 
-extract all protection information
+.B \-p, \-\-same\-permissions, \-\-preserve\-permissions 
+ignore umask when extracting files (the default for root)
 .TP
-.B -P, --absolute-paths	
+.B \-P, \-\-absolute\-names
 don't strip leading `/'s from file names
 .TP
-.B --preserve		
-like -p -s
+.B \-\-posix
+create POSIX compliant archive.  This option is deprecated,
+please use 
+.B \-\-format\=posix
+instead.
 .TP
-.B -R, --record-number	
-show record number within archive with each message
+.B \-\-preserve		
+like \-p \-s
+.TP
+.B \-R, \-\-block\-number	
+show block number within archive with each message
+.TP
+.B \-\-record\-size SIZE
+use SIZE bytes per record
+.TP
+.B \-\-recursion
+recurse into directories (the default)
+.TP
+.B \-\-recursive\-unlink
+remove existing directories before extracting directories of the same
+name
 .TP 
-.B --remove-files		
+.B \-\-remove\-files		
 remove files after adding them to the archive
 .TP
-.B -s, --same-order, --preserve-order	
+.B \-\-rsh\-command=CMD
+Use remote COMMAND instead of `rsh'.  This option exists so that
+people who use something other than the standard `rsh' (e.g., a
+Kerberized `rsh') can access a remote device.
+.TP
+.B \-S, \-\-sparse		
+handle sparse files efficiently
+.TP
+.B \-s, \-\-same\-order, \-\-preserve\-order	
 list of names to extract is sorted to match archive
 .TP
-.B --same-owner		
-create extracted files with the same ownership 
+.B \-\-same\-owner		
+extract files with owner as specified in archive (the default for
+root)
 .TP
-.B --numeric-owner
-always use numbers for user/group names
+.B \-\-show\-omitted\-dirs
+mention directories that are being skipped over
 .TP
-.B -S, --sparse		
-handle sparse files efficiently
+.BI \-\-strip\-components " n"
+Strip the given number of leading directory components
+.TP
+.B \-\-strip, \-\-strip\-components N
+Strips the first N components from archive members' pathnames when
+unpacking.
+.TP
+.B \-\-suffix SUFFIX
+append SUFFIX to make backup files (default ~)
 .TP 
-.B -T, --files-from F	
-get names to extract or create from file F
+.B \-T, \-\-files\-from F	
+get names to extract or archive from file F
 .TP
-.B --null			
--T reads null-terminated names, disable -C
+.B \-\-totals
+display total bytes written after creating an archive
 .TP
-.B --totals		
-print total bytes written with --create
+.B \-U, \-\-unlink\-first
+unlink & recreate files instead of overwriting
 .TP
-.B -v, --verbose		
+.B \-\-use\-compress\-program PROG
+filter the archive through PROG (which must accept \-d)
+.TP
+.B \-v, \-\-verbose		
 verbosely list files processed
 .TP
-.B -V, --label NAME	
+.B \-V, \-\-label NAME	
 create archive with volume name NAME
 .TP 
-.B --version		
+.B \-\-version		
 print tar program version number
 .TP
-.B -w, --interactive, --confirmation	
+.B \-\-volno\-file F
+keep track of current volume (of a multi-volume archive) in F
+.TP
+.B \-w, \-\-interactive, \-\-confirmation	
 ask for confirmation for every action
 .TP
-.B -W, --verify		
+.B \-W, \-\-verify		
 attempt to verify the archive after writing it
 .TP
-.B --exclude=FILE		
-exclude file FILE
+.B \-\-wildcards
+use wildcards when excluding files (the default)
 .TP
-.B -X, --exclude-from FILE	
-exclude files listed in FILE
+.B \-\-wildcards\-match\-slash
+allow wildcards to match "/" (the default)
 .TP
-.B -Z, --compress, --uncompress      	
+.B \-X, \-\-exclude\-from=FILE	
+exclude files matching patterns listed in FILE
+.TP
+.B \-Z, \-\-compress, \-\-uncompress      	
 filter the archive through compress
 .TP 
-.B -z, --gzip, --ungzip		
+.B \-z, \-\-gzip, \-\-gunzip, \-\-ungzip		
 filter the archive through gzip
 .TP
-.B --use-compress-program PROG
-filter the archive through PROG (which must accept -d)
+.B \-[0\-7][lmh]		
+specify drive and density
+.SH ENVIRONMENT
+The behavior of tar is controlled by the following environment variables,
+among others:
 .TP
-.B --block-compress	
-block the output of compression program for tapes
+.B TAPE
+Device or file to use for the archive if \fB--file\fR is not specified.
+If this environment variable is unset, use stdin or stdout instead.
 .TP
-.B --rsh-command=CMD
-Use remote COMMAND instead of `rsh'.  This option exists so that
-people who use something other than the standard `rsh' (e.g., a
-Kerberized `rsh') can access a remote device.
-.TP
-.B -[0-7][lmh]		
-specify drive and density
+.B TAR_OPTIONS
+Options to prepend to those specified on the command line, separated by
+whitespace.  Embedded backslashes may be used to escape whitespace or
+backslashes within an option.
+.LP
+In addition, the value of the blocking factor is made available to info
+and checkpoint scripts via environment variable 
+.B TAR_BLOCKING_FACTOR.
 .SH BUGS
 .LP
 The GNU folks, in general, abhor man pages, and create info documents instead.
-The maintainer of tar falls into this category.  This man page is neither
-complete, nor current, and was included in the Debian Linux packaging of tar
-entirely to reduce the frequency with which the lack of a man page gets
-reported as a bug in our defect tracking system.
+Unfortunately, the info document describing tar is licensed under the GFDL with
+invariant cover texts, which violates the Debian Free Software Guidelines.  As
+a result, the info documentation for tar is not included in the Debian package.
 
-If you really want to understand tar, then you should run info and read the
-tar info pages, or use the info mode in emacs.
+If you want to read the complete documentation for GNU tar, please refer to
+the online version at 
+.PP
+.ce 1
+<http://www.gnu.org/software/tar/manual/index.html>
+.PP
+This man page was created for the Debian distribution.  It does not describe
+all of the functionality of tar, and it is often out of date.  Patches to 
+improve the coverage and/or accuracy of this man page are appreciated, and
+should be filed as wishlist severity bugs against the Debian tar package, 
+not submitted to the GNU tar maintainers.
 

Added: tar.install
===================================================================
--- tar.install	                        (rev 0)
+++ tar.install	2008-12-22 13:09:01 UTC (rev 22149)
@@ -0,0 +1,19 @@
+infodir=/usr/share/info
+filelist=(tar.info tar.info-1 tar.info-2)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+




More information about the arch-commits mailing list