Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15555/10.7/stable/main/finkinfo/libs
Modified Files:
libarchive.info
Added Files:
libarchive31.info libarchive31.patch
Removed Files:
libarchive.patch
Log Message:
New upstream version: libarchive 3.1.2.
Left the libarchive 2.8.5 for backward compatibility.
(The kdeutils4-{mac,x11} and deb-gview depends on that.)
Moved the bsdtar splitoff from the libarchive.info to the libarchive31.info.
Index: libarchive.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libarchive.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libarchive.info 12 Jul 2012 15:11:29 -0000 1.1
+++ libarchive.info 17 Aug 2013 06:57:34 -0000 1.2
@@ -1,24 +1,41 @@
Package: libarchive
Version: 2.8.5
-Revision: 1
+Revision: 2
Description: Archiver library for tar, pax and others
-BuildDepends: bzip2-dev, fink-package-precedence, liblzma5, libxml2,
system-openssl-dev
-Depends: %N-shlibs (=%v-%r), bzip2-shlibs, liblzma5-shlibs
+BuildDepends: fink-package-precedence, bzip2-dev, liblzma5, libxml2,
system-openssl-dev
+Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
+Conflicts: libarchive31
+Replaces: libarchive31
Source: http://libarchive.googlecode.com/files/libarchive-%v.tar.gz
Source-MD5: 9caf51dcf6213e9c9f5a1c27448b9c90
-PatchFile: %n.patch
-PatchFile-MD5: ac32daa8ad3d0284c03ef6dbb9690aa4
PatchScript: <<
%{default_script}
-/usr/bin/sed -i.bak 's/^\.Fx/FreeBSD/' libarchive/*.[1-9]
+LANG=C LC_ALL=C /usr/bin/sed -i.bak 's/^\.Fx/FreeBSD/' libarchive/*.[1-9]
<<
-ConfigureParams: --enable-bsdtar=shared --enable-bsdcpio --without-lzmadec
--with-lzma --enable-dependency-tracking ACLOCAL=: AUTOCONF=: AUTOMAKE=:
AUTOHEADER=:
+ConfigureParams: <<
+--disable-bsdtar \
+--disable-bsdcpio \
+--with-zlib \
+--with-bz2lib \
+--without-lzmadec \
+--with-lzma \
+--with-openssl \
+--with-xml2 \
+--without-expat \
+--enable-dependency-tracking \
+ACLOCAL=: AUTOCONF=: AUTOMAKE=: AUTOHEADER=:
+<<
+SetCPPFLAGS: -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
CompileScript: <<
- %{default_script}
- fink-package-precedence --prohibit-bdep=%n .
+%{default_script}
+fink-package-precedence --prohibit-bdep=%n .
+<<
+InstallScript: <<
+DESTDIR=%d make install
+rm -r %i/bin %i/share/man/man[15]
<<
-InstallScript: DESTDIR=%d make install
DocFiles: COPYING README NEWS
SplitOff: <<
Package: %N-shlibs
@@ -27,45 +44,6 @@
Shlibs: %p/lib/libarchive.2.dylib 11.0.0 %n (>= 2.8.5-1)
DocFiles: COPYING README NEWS
<<
-SplitOff2: <<
- Package: bsdtar
- Description: FreeBSD's powerful tar and cpio
- Depends: %N-shlibs (>= %v-%r), bzip2-shlibs, libiconv, liblzma5-shlibs,
libxml2-shlibs
- Files: bin share/man/man1
- DocFiles: COPYING README NEWS
- DescDetail: <<
- The bsdtar program is FreeBSD's modern implementation of tar based
- on libarchive. It started as a test harness, but has grown into a
- feature-competitive replacement for GNU tar.
-
- Following formats are supported ('r' for reading and 'w' for writing).
- On read, compression and format are always detected automatically.
- [rw] gzip compression
- [rw] bzip2 compression
- [rw] compress/LZW compression
- [rw] lzma and xz compression
- [r ] GNU tar format (including GNU long filenames, long link names, and
- sparse files)
- [r ] Solaris 9 extended tar format (including ACLs)
- [r ] Old V7 tar archives
- [rw] POSIX 1003.1-1988 ustar
- [rw] POSIX 1003.1-2001 pax interchange format (indeed extended ustar)
- [ w] "restricted" pax format, which will create ustar archives except for
- entries that require pax extensions (for long filenames, ACLs, etc).
- [rw] POSIX octet-oriented cpio ("odc")
- [rw] SVR4 ASCII cpio ("newc")
- [r ] Binary cpio (big-endian or little-endian)
- [r ] ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
- [r ] ZIP archives (with uncompressed or "deflate" compressed entries)
- [ w] shar archives
- [rw] GNU and BSD 'ar' archives
- [rw] 'mtree' format
- <<
- DescUsage: <<
- You can usually use bsdtar and bsdcpio in the same way to GNU tar and cpio
- but there are some differences. Read bsdtar(1) and bsdcpio(1) manpage for
details.
- <<
-<<
DescDetail: <<
Libarchive is a stream-oriented library for variety of archives.
It focuses on tar format and its variants primarily, but can also
@@ -73,42 +51,52 @@
Following formats are supported ('r' for reading and 'w' for writing).
On read, compression and format are always detected automatically.
+
+[r ] uuencoded files
+[r ] files with RPM wrapper
[rw] gzip compression
[rw] bzip2 compression
[rw] compress/LZW compression
-[rw] lzma and xz compression
+[rw] lzma, and xz compression
+
[r ] GNU tar format (including GNU long filenames, long link names, and
sparse files)
[r ] Solaris 9 extended tar format (including ACLs)
[r ] Old V7 tar archives
-[rw] POSIX 1003.1-1988 ustar
-[rw] POSIX 1003.1-2001 pax interchange format (indeed extended ustar)
-[ w] "restricted" pax format, which will create ustar archives except for
+[rw] POSIX ustar
+[rw] POSIX pax interchange format
+[rw] "restricted" pax format, which will create ustar archives except for
entries that require pax extensions (for long filenames, ACLs, etc).
+ This is the default, which is mostly compatible with the standard tar.
[rw] POSIX octet-oriented cpio ("odc")
[rw] SVR4 ASCII cpio ("newc")
[r ] Binary cpio (big-endian or little-endian)
-[r ] ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
-[r ] ZIP archives (with uncompressed or "deflate" compressed entries)
[ w] shar archives
+[r ] ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
+[rw] ZIP archives (with uncompressed or "deflate" compressed entries)
[rw] GNU and BSD 'ar' archives
[rw] 'mtree' format
+[rw] XAR archives
<<
DescUsage: <<
Guide to Documentation installed by this system:
- * libarchive.3 gives an overview of the library as a whole
- * archive_read.3, archive_write.3, and archive_write_disk.3 provide
- detailed calling sequences for the read and write APIs
- * archive_entry.3 details the "struct archive_entry" utility class
- * libarchive-formats.5 documents the file formats supported by the library
- * tar.5 provides some detailed information about a variety of different
- "tar" formats.
+* libarchive.3 gives an overview of the library as a whole
+* archive_read.3, archive_write.3, and archive_write_disk.3 provide
+ detailed calling sequences for the read and write APIs
+* archive_entry.3 details the "struct archive_entry" utility class
<<
DescPort: <<
Since Darwin/MacOS X does not support any tape device, the default
device is changed to stdio. The manpage warns users not to rely on
this behaviour or they knock the real tape device on other platforms.
+
+The share/man/man5/* manpages are previously included in the
+libarchive package (for developers), but now in the bsdtar package.
+
+This package provides a legacy version of libarchive.
+Packagers should link the bsdtar utility against the latest version
+of the libarchive and include it into the libarchiveNN.info.
<<
License: BSD
Maintainer: AIDA Shinra <shi...@j10n.org>
-Homepage: http://people.freebsd.org/~kientzle/libarchive/
+Homepage: http://www.libarchive.org/
--- NEW FILE: libarchive31.info ---
Package: libarchive31
Version: 3.1.2
Revision: 1
Description: Archiver library for tar, pax and others
BuildDepends: fink-package-precedence, bzip2-dev, libiconv-dev, liblzma5,
expat1, system-openssl-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Conflicts: libarchive
Replaces: libarchive
Source: http://www.libarchive.org/downloads/libarchive-%v.tar.gz
Source-MD5: efad5a503f66329bb9d2f4308b5de98a
PatchFile: %n.patch
PatchFile-MD5: 6dca91e03f2e47ac627b8cd8de1ed04a
PatchScript: <<
%{default_script}
LANG=C LC_ALL=C /usr/bin/sed -i.bak 's/^\.Fx/FreeBSD/' libarchive/*.[1-9]
<<
ConfigureParams: <<
--enable-bsdtar=shared \
--enable-bsdcpio=shared \
--enable-posix-regex-lib=libc \
--with-zlib \
--with-bz2lib \
--without-lzmadec \
--with-iconv \
--with-lzma \
--without-lzo2 \
--without-nettle \
--with-openssl \
--without-xml2 \
--with-expat \
--enable-dependency-tracking \
ACLOCAL=: AUTOCONF=: AUTOMAKE=: AUTOHEADER=:
<<
SetCPPFLAGS: -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
CompileScript: <<
%{default_script}
fink-package-precedence --prohibit-bdep=%n .
<<
InstallScript: <<
DESTDIR=%d make install
# rm -r %i/bin %i/share/man/man[15]
<<
DocFiles: COPYING README NEWS
SplitOff: <<
Package: %N-shlibs
Depends: bzip2-shlibs, libiconv, liblzma5-shlibs, expat1-shlibs
Files: lib/libarchive.*.dylib
Shlibs: %p/lib/libarchive.13.dylib 15.0.0 %n (>= 3.1.2-0)
DocFiles: COPYING README NEWS
<<
SplitOff2: <<
Package: bsdtar
Description: FreeBSD's powerful tar and cpio
Depends: %N-shlibs (>=%v-%r)
Conflicts: libarchive (<< 2.8.5-2)
Files: bin share/man/man[15]
DocFiles: COPYING README NEWS
DescUsage: <<
You can usually use bsdtar and bsdcpio in the same way to GNU tar and cpio
but there are some differences. Read bsdtar(1) and bsdcpio(1) manpage
for details. The libarchive-formats(5) manpage describes the file formats
supported by the libarchive.
<<
<<
DescDetail: <<
The bsdtar program is FreeBSD's modern implementation of tar based
on the libarchive. It started as a test harness, but has grown into a
feature-competitive replacement for GNU tar.
The libarchive is a stream-oriented library for variety of archives.
It focuses on tar format and its variants primarily, but can also
read and/or write other families of archive formats.
Following formats are supported ('r' for reading and 'w' for writing).
On read, compression and format are always detected automatically.
[rw] uuencoded files
[r ] files with RPM wrapper
[rw] gzip compression
[rw] bzip2 compression
[rw] compress/LZW compression
[rw] lzma, lzip, and xz compression
[rw] GNU tar format (including GNU long filenames, long link names, and
sparse files)
[r ] Solaris 9 extended tar format (including ACLs)
[rw] Old V7 tar archives
[rw] POSIX ustar
[rw] POSIX pax interchange format
[rw] "restricted" pax format, which will create ustar archives except for
entries that require pax extensions (for long filenames, ACLs, etc).
This is the default, which is mostly compatible with the standard tar.
[rw] POSIX octet-oriented cpio ("odc")
[rw] SVR4 ASCII cpio ("newc")
[r ] Binary cpio (big-endian or little-endian)
[ w] shar archives
[rw] ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
[rw] ZIP archives (with uncompressed or "deflate" compressed entries)
[rw] GNU and BSD 'ar' archives
[rw] 'mtree' format
[rw] 7-Zip archives
[r ] Microsoft CAB format
[r ] LHA and LZH archives
[r ] RAR archives
[rw] XAR archives
<<
DescUsage: <<
Guide to Documentation installed by this system:
* libarchive.3 gives an overview of the library as a whole
* archive_read.3, archive_write.3, and archive_write_disk.3 provide
detailed calling sequences for the read and write APIs
* archive_entry.3 details the "struct archive_entry" utility class
* libarchive-formats.5 documents the file formats supported by the library
(in the bsdtar package)
* tar.5 and cpio.5 provides some detailed information about a variety
of different "tar" and "cpio" formats (in the bsdtar package)
<<
DescPort: <<
Since Darwin/MacOS X does not support any tape device, the default
device is changed to stdio. The manpage warns users not to rely on
this behaviour or they knock the real tape device on other platforms.
The share/man/man5/* manpages are previously included in the
libarchive package (for developers), but now in the bsdtar package.
Packagers should link the bsdtar utility against the latest version
of the libarchive and include it into the libarchiveNN.info.
When you create an incompatible version of the libarchive and bsdtar,
remove the bsdtar SplitOff from this .info and remove the %i/bin/ and
%i/share/man/man[15]/ directories.
<<
License: BSD
Maintainer: AIDA Shinra <shi...@j10n.org>
Homepage: http://www.libarchive.org/
--- libarchive.patch DELETED ---
--- NEW FILE: libarchive31.patch ---
diff -Naur libarchive-3.1.2.orig/cpio/bsdcpio.1 libarchive-3.1.2/cpio/bsdcpio.1
--- libarchive-3.1.2.orig/cpio/bsdcpio.1 2013-01-14 01:43:45.000000000
+0000
+++ libarchive-3.1.2/cpio/bsdcpio.1 2013-08-16 12:31:15.000000000 +0000
@@ -123,18 +123,42 @@
Produce the output archive in the specified format.
Supported formats include:
.Pp
-.Bl -tag -width "iso9660" -compact
+.Bl -tag -width "shardump" -compact
+.It Ar 7zip
+7z archive compatible with the 7-Zip
+.It Ar arbsd
+Static library compatible with BSD ar(1)
+.It Ar arsvr4
+Static library compatible with SVR4 and GNU ar(1)
+.It Ar bsdtar
+(DEFAULT) Restricted pax; mostly compatible with the standard tar
.It Ar cpio
Synonym for
.Ar odc .
+.It Ar gnutar
+Tar archive with GNU extensions
+.It Ar iso9660
+ISO9660 CD-ROM image
+.It Ar mtree
+Not a true archive but a textual description of filesystem hierarchy
.It Ar newc
-The SVR4 portable cpio format.
+SVR4 ASCII cpio archive
.It Ar odc
-The old POSIX.1 portable octet-oriented cpio format.
+POSIX.1-1988 standard cpio archive
.It Ar pax
-The POSIX.1 pax format, an extension of the ustar format.
+Extended tar format introduced by POSIX.1-2001 standard
+.It Ar shar
+Shell archive composed of text files only
+.It Ar shardump
+Shell archive supporting binary files, but depends on uuencode and uudecode
.It Ar ustar
-The POSIX.1 tar format.
+Standard tar archive compatible with the most of tar(1) implementations
+.It Ar v7tar
+Traditional tar archive compatible with the UNIX V7
+.It Ar xar
+XAR archives
+.It Ar zip
+Zip archive commonly used in Windows
.El
.Pp
The default format is
diff -Naur libarchive-3.1.2.orig/libarchive/libarchive.3
libarchive-3.1.2/libarchive/libarchive.3
--- libarchive-3.1.2.orig/libarchive/libarchive.3 2013-01-13
21:10:46.000000000 +0000
+++ libarchive-3.1.2/libarchive/libarchive.3 2013-08-16 08:20:32.000000000
+0000
@@ -64,6 +64,8 @@
.It
ISO9660 CD images (including RockRidge and Joliet extensions),
.It
+7-Zip archives,
+.It
Zip archives,
.It
ar archives (including GNU/SysV and BSD extensions),
diff -Naur libarchive-3.1.2.orig/tar/bsdtar.1 libarchive-3.1.2/tar/bsdtar.1
--- libarchive-3.1.2.orig/tar/bsdtar.1 2013-01-14 01:43:45.000000000 +0000
+++ libarchive-3.1.2/tar/bsdtar.1 2013-08-16 12:33:09.000000000 +0000
@@ -197,12 +197,48 @@
(c, r, u mode only)
Use the specified format for the created archive.
Supported formats include
-.Dq cpio ,
-.Dq pax ,
-.Dq shar ,
-and
-.Dq ustar .
-Other formats may also be supported; see
+.Pp
+.Bl -tag -width "shardump" -compact
+.It Ar 7zip
+7z archive compatible with the 7-Zip
+.It Ar arbsd
+Static library compatible with BSD ar(1)
+.It Ar arsvr4
+Static library compatible with SVR4 and GNU ar(1)
+.It Ar bsdtar
+(DEFAULT) Restricted pax; mostly compatible with the standard tar
+.It Ar cpio
+Synonym for
+.Ar odc .
+.It Ar gnutar
+Tar archive with GNU extensions
+.It Ar iso9660
+ISO9660 CD-ROM image
+.It Ar mtree
+Not a true archive but a textual description of filesystem hierarchy
+.It Ar newc
+SVR4 ASCII cpio archive
+.It Ar odc
+POSIX.1-1988 standard cpio archive
+.It Ar pax
+Extended tar format introduced by POSIX.1-2001 standard
+.It Ar shar
+Shell archive composed of text files only
+.It Ar shardump
+Shell archive supporting binary files, but depends on uuencode and uudecode
+.It Ar ustar
+Standard tar archive compatible with the most of tar(1) implementations
+.It Ar v7tar
+Traditional tar archive compatible with the UNIX V7
+.It Ar xar
+XAR archives
+.It Ar zip
+Zip archive commonly used in Windows
+.El
+.Pp
+The default is
+.Ar bsdtar .
+See
.Xr libarchive-formats 5
for more information about currently-supported formats.
In r and u modes, when extending an existing archive, the format specified
@@ -213,12 +249,7 @@
.Pa -
for standard input or standard output.
The default varies by system;
-on
-.Fx ,
-the default is
-.Pa /dev/sa0 ;
-on Linux, the default is
-.Pa /dev/st0 .
+on Fink/MacOS X, the default is standard input or output.
.It Fl Fl gid Ar id
Use the provided group id number.
On extract, this overrides the group id in the archive;
@@ -1025,10 +1056,7 @@
public-domain implementation (circa November, 1987)
was quite influential, and formed the basis of GNU tar.
GNU tar was included as the standard system tar
-in
-.Fx
-beginning with
-.Fx 1.0 .
+in FreeBSD beginning with FreeBSD 1.0 .
.Pp
This is a complete re-implementation based on the
.Xr libarchive 3
diff -Naur libarchive-3.1.2.orig/tar/bsdtar.c libarchive-3.1.2/tar/bsdtar.c
--- libarchive-3.1.2.orig/tar/bsdtar.c 2013-02-07 23:56:25.000000000 +0000
+++ libarchive-3.1.2/tar/bsdtar.c 2013-08-16 04:43:55.000000000 +0000
@@ -208,8 +208,10 @@
/* Default: open tape drive. */
bsdtar->filename = getenv("TAPE");
+#if !(defined(__APPLE__) && defined(__MACH__)) /* default to stdio on
Fink/MacOS X */
if (bsdtar->filename == NULL)
bsdtar->filename = _PATH_DEFTAPE;
+#endif
/* Default block size settings. */
bsdtar->bytes_per_block = DEFAULT_BYTES_PER_BLOCK;
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
