Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24316/10.4/stable/main/finkinfo/libs
Modified Files:
libarchive.info libarchive.patch
Log Message:
Sync with unstable.
Index: libarchive.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libarchive.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libarchive.info 24 May 2007 08:10:24 -0000 1.2
+++ libarchive.info 3 Dec 2007 09:54:27 -0000 1.3
@@ -1,24 +1,24 @@
Package: libarchive
-Version: 2.2.2
+Version: 2.4.0
Revision: 1
Description: Archiver library for tar, pax and others
BuildDepends: bzip2-dev
Depends: %N-shlibs (=%v-%r), bzip2-shlibs
BuildDependsOnly: true
Source: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%v.tar.gz
-Source-MD5: 0162127d7e71a07eba39c9c3e906c78e
+Source-MD5: 9b06995c6c9d000892b7320a4a4fedcb
PatchScript: <<
patch -p1 < %a/%n.patch
/usr/bin/sed -i.bak 's/^\.Fx/FreeBSD/' libarchive/*.[1-9]
<<
-ConfigureParams: --mandir=%p/share/man ACLOCAL=: AUTOCONF=: AUTOMAKE=:
AUTOHEADER=:
+ConfigureParams: --enable-bsdtar=shared --disable-bsdcpio ACLOCAL=: AUTOCONF=:
AUTOMAKE=: AUTOHEADER=:
InstallScript: DESTDIR=%d make install
DocFiles: COPYING README NEWS
SplitOff: <<
Package: %N-shlibs
Depends: bzip2-shlibs
Files: lib/libarchive.*.dylib
- Shlibs: %p/lib/libarchive.2.dylib 4.0.0 %n (>= 2.1.6-1) 32
+ Shlibs: %p/lib/libarchive.2.dylib 7.0.0 %n (>= 2.4.0-1) 32
DocFiles: COPYING README NEWS
<<
SplitOff2: <<
@@ -45,13 +45,14 @@
[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
- [r ] SVR4 ASCII cpio
+ [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 extensions)
[r ] ZIP archives (with uncompressed or "deflate" compressed entries)
[ w] shar archives
[rw] GNU and BSD 'ar' archives
+ [r ] 'mtree' format
<<
DescUsage: <<
You can usually use bsdtar in the same way to GNU tar but there are
@@ -76,13 +77,14 @@
[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
-[r ] SVR4 ASCII cpio
+[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 extensions)
[r ] ZIP archives (with uncompressed or "deflate" compressed entries)
[ w] shar archives
[rw] GNU and BSD 'ar' archives
+[r ] 'mtree' format
<<
DescUsage: <<
Guide to Documentation installed by this system:
@@ -100,7 +102,9 @@
this behaviour or they knock the real tape device on other platforms.
<<
DescPackaging: <<
-Bsdtar command is changed to link libarchive dynamically.
+Since bsdcpio is still alpha and has its own version, I don't included it.
+I will include it in the bsdtar package after the bsdcpio get so matured
+that it has the same version number to the libarchive.
<<
License: BSD
Maintainer: AIDA Shinra <[EMAIL PROTECTED]>
Index: libarchive.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libarchive.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libarchive.patch 24 May 2007 08:10:24 -0000 1.2
+++ libarchive.patch 3 Dec 2007 09:54:27 -0000 1.3
@@ -1,33 +1,7 @@
-diff -Naur libarchive-2.2.2.orig/Makefile.am libarchive-2.2.2/Makefile.am
---- libarchive-2.2.2.orig/Makefile.am 2007-05-07 11:59:38.000000000 +0000
-+++ libarchive-2.2.2/Makefile.am 2007-05-21 12:46:59.000000000 +0000
-@@ -201,6 +201,6 @@
-
- bsdtar_LDADD= -larchive
- bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
--# Link libarchive statically...
--bsdtar_LDFLAGS= -static -I$(destdir)/libarchive
-+# Original bsdtar links libarchive statically, but Fink does dynamically
-+bsdtar_LDFLAGS= -I$(destdir)/libarchive
- bsdtar_dist_man_MANS= tar/bsdtar.1
-diff -Naur libarchive-2.2.2.orig/Makefile.in libarchive-2.2.2/Makefile.in
---- libarchive-2.2.2.orig/Makefile.in 2007-05-13 06:38:13.000000000 +0000
-+++ libarchive-2.2.2/Makefile.in 2007-05-21 12:46:59.000000000 +0000
-@@ -551,8 +551,8 @@
-
- bsdtar_LDADD = -larchive
- bsdtar_CPPFLAGS = -I$(top_builddir)/libarchive
--# Link libarchive statically...
--bsdtar_LDFLAGS = -static -I$(destdir)/libarchive
-+# Original bsdtar links libarchive statically, but Fink does dynamically
-+bsdtar_LDFLAGS= -I$(destdir)/libarchive
- bsdtar_dist_man_MANS = tar/bsdtar.1
- all: $(BUILT_SOURCES) config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
-diff -Naur libarchive-2.2.2.orig/tar/bsdtar.1 libarchive-2.2.2/tar/bsdtar.1
---- libarchive-2.2.2.orig/tar/bsdtar.1 2007-04-15 22:24:05.000000000 +0000
-+++ libarchive-2.2.2/tar/bsdtar.1 2007-04-22 11:26:55.000000000 +0000
-@@ -152,13 +152,31 @@
+diff -Naur libarchive-2.4.0.orig/tar/bsdtar.1 libarchive-2.4.0/tar/bsdtar.1
+--- libarchive-2.4.0.orig/tar/bsdtar.1 2007-10-07 06:27:48.000000000 +0000
++++ libarchive-2.4.0/tar/bsdtar.1 2007-11-16 10:42:02.000000000 +0000
+@@ -155,13 +155,35 @@
.It Fl -format Ar format ( Fl W Cm format Ns = Ns Ar format )
(c mode only)
Use the specified format for the created archive.
@@ -47,8 +21,12 @@
+extended tar format introduced by POSIX 1003.1-2001 standard
+.It posix
+synonym of pax
-+.It cpio
++.It odc
+standard cpio archive
++.It cpio
++synonym of odc
++.It newc
++SVR4 format cpio archive
+.It arbsd
+static library compatible with BSD ar(1)
+.It ar
@@ -66,7 +44,7 @@
.Xr libarchive-formats 5
for more information about currently-supported formats.
.It Fl f Ar file
-@@ -166,11 +184,14 @@
+@@ -169,11 +191,14 @@
The filename can be
.Pa -
for standard input or standard output.
@@ -86,7 +64,7 @@
.It Fl -fast-read ( Fl W Cm fast-read )
(x and t mode only)
Extract or list only the first archive entry that matches each pattern
-@@ -435,15 +456,6 @@
+@@ -438,15 +463,6 @@
.Xr environ 7
for more information.
.El
@@ -102,7 +80,7 @@
.Sh EXIT STATUS
.Ex -std
.Sh EXAMPLES
-@@ -666,10 +678,7 @@
+@@ -672,10 +688,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
@@ -114,10 +92,10 @@
.Pp
This is a complete re-implementation based on the
.Xr libarchive 3
-diff -Naur libarchive-2.2.2.orig/tar/bsdtar.c libarchive-2.2.2/tar/bsdtar.c
---- libarchive-2.2.2.orig/tar/bsdtar.c 2007-05-07 11:38:05.000000000 +0000
-+++ libarchive-2.2.2/tar/bsdtar.c 2007-05-21 12:46:59.000000000 +0000
-@@ -257,8 +257,10 @@
+diff -Naur libarchive-2.4.0.orig/tar/bsdtar.c libarchive-2.4.0/tar/bsdtar.c
+--- libarchive-2.4.0.orig/tar/bsdtar.c 2007-09-16 23:30:14.000000000 +0000
++++ libarchive-2.4.0/tar/bsdtar.c 2007-11-16 10:01:44.000000000 +0000
+@@ -267,8 +267,10 @@
/* Default: open tape drive. */
bsdtar->filename = getenv("TAPE");
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
