CVS commit: pkgsrc/archivers/libarchive/files

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Sep 22 09:50:54 UTC 2019

Modified Files:
        pkgsrc/archivers/libarchive/files/contrib: libarchive.1aix53.spec
        pkgsrc/archivers/libarchive/files/libarchive: archive_pack_dev.c
            archive_pack_dev.h
        pkgsrc/archivers/libarchive/files/libarchive/test:
            test_compat_zip_8.zip.uu

Log Message:
Properly merge libarchive-3.3.3


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec
diff -u pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec:1.9 pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec:1.10
--- pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec:1.9        Tue Aug  1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec    Sun Sep 22 09:50:54 2019
@@ -127,8 +127,8 @@ rm -fr %buildroot
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log: libarchive.1aix53.spec,v $
-Revision 1.9  2017/08/01 22:26:22  joerg
-Merge for libarchive-3.3.2.
+Revision 1.10  2019/09/22 09:50:54  joerg
+Properly merge libarchive-3.3.3
 
 Release 1aix53  2006/12/12 rm1023%dcx.com@localhost
 - tweak for aix-5.3

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c:1.5 Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c     Sun Sep 22 09:50:54 2019
@@ -1,4 +1,4 @@
-/*     $NetBSD: archive_pack_dev.c,v 1.5 2019/04/10 08:24:05 adam Exp $        */
+/*     $NetBSD: archive_pack_dev.c,v 1.6 2019/09/22 09:50:54 joerg Exp $       */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #include <sys/cdefs.h>
 #endif
 #if !defined(lint)
-__RCSID("$NetBSD: archive_pack_dev.c,v 1.5 2019/04/10 08:24:05 adam Exp $");
+__RCSID("$NetBSD: archive_pack_dev.c,v 1.6 2019/09/22 09:50:54 joerg Exp $");
 #endif /* not lint */
 
 #ifdef HAVE_LIMITS_H

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.h:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.h:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.h:1.4 Tue Aug  1 22:26:23 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.h     Sun Sep 22 09:50:54 2019
@@ -1,4 +1,4 @@
-/*     $NetBSD: archive_pack_dev.h,v 1.4 2017/08/01 22:26:23 joerg Exp $       */
+/*     $NetBSD: archive_pack_dev.h,v 1.5 2019/09/22 09:50:54 joerg Exp $       */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.

Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu:1.1      Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu  Sun Sep 22 09:50:54 2019
@@ -1,6 +1,6 @@
-begin 666 test_compat_zip_8.zip
-M4$L#!!0````(`%A\;TOY6""D$`````X````(````87)C7'1E<W3[_Z^$(96A
-MF*&$@9>!BP$`4$L!`A0`%`````@`6'QO2_E8(*00````#@````@`````````
-H`````````````&%R8UQT97-T4$L%!@`````!``$`-@```#8`````````
-`
-end
+begin 666 test_compat_zip_8.zip
+M4$L#!!0````(`%A\;TOY6""D$`````X````(````87)C7'1E<W3[_Z^$(96A
+MF*&$@9>!BP$`4$L!`A0`%`````@`6'QO2_E8(*00````#@````@`````````
+H`````````````&%R8UQT97-T4$L%!@`````!``$`-@```#8`````````
+`
+end