Merge from vendor branch LIBARCHIVE:
authorPeter Avalos <pavalos@dragonflybsd.org>
Mon, 16 Jul 2007 21:52:17 +0000 (21:52 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Mon, 16 Jul 2007 21:52:17 +0000 (21:52 +0000)
Import libarchive-2.2.5 which fixes a forgotten 'break'.  Without this,
hardlinks were being returned as symlinks.

contrib/libarchive-2/NEWS
contrib/libarchive-2/libarchive/archive_read_support_format_tar.c
contrib/libarchive-2/tar/bsdtar.c
contrib/libarchive-2/tar/bsdtar.h
contrib/libarchive-2/tar/read.c
contrib/libarchive-2/tar/write.c
contrib/libarchive-2/version

index 3b5c88a..941a62a 100644 (file)
@@ -1,4 +1,8 @@
 
+Jul 13, 2007: libarchive 2.2.5 released
+
+Jul 12, 2007: libarchive 2.2.4 released
+
 May 26, 2007: libarchive 2.2.3 released
 May 26, 2007: Fix memory leaks in ZIP reader and shar writer, add some
        missing system headers to archive_entry.h, dead code cleanup
index f01015c..679e4ee 100644 (file)
@@ -1000,6 +1000,7 @@ header_common(struct archive_read *a, struct tar *tar,
                        archive_entry_set_size(entry, 0);
                        tar->entry_bytes_remaining = 0;
                }
+               break;
        case '2': /* Symlink */
                archive_entry_set_filetype(entry, AE_IFLNK);
                archive_entry_set_size(entry, 0);
index 4303b94..f511b86 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.74 2007/03/24 03:25:49 kientzle Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.75 2007/05/29 05:39:10 kientzle Exp $");
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
index d99c23d..3117d66 100644 (file)
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.27 2007/03/11 10:36:42 kientzle Exp $
+ * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.28 2007/05/29 05:39:10 kientzle Exp $
  */
 
 #include "bsdtar_platform.h"
index ff457e3..4eb2a86 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.32 2007/05/08 15:22:21 kientzle Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.33 2007/05/29 05:39:10 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
index bec066b..f25b685 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.62 2007/05/03 04:33:11 cperciva Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.63 2007/05/29 05:39:10 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
index 6b4d157..ecf00d9 100644 (file)
@@ -1 +1 @@
-2.2.3
\ No newline at end of file
+2.2.5
\ No newline at end of file