[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files Properly merge libarchive-3...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed50fe76fd64
branches:  trunk
changeset: 401676:ed50fe76fd64
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 22 09:50:54 2019 +0000

description:
Properly merge libarchive-3.3.3

diffstat:

 archivers/libarchive/files/contrib/libarchive.1aix53.spec |  4 ++--
 archivers/libarchive/files/libarchive/archive_pack_dev.c  |  4 ++--
 archivers/libarchive/files/libarchive/archive_pack_dev.h  |  2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r a85598f784b0 -r ed50fe76fd64 archivers/libarchive/files/contrib/libarchive.1aix53.spec
--- a/archivers/libarchive/files/contrib/libarchive.1aix53.spec Sun Sep 22 09:47:22 2019 +0000
+++ b/archivers/libarchive/files/contrib/libarchive.1aix53.spec Sun Sep 22 09:50:54 2019 +0000
@@ -127,8 +127,8 @@
 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
diff -r a85598f784b0 -r ed50fe76fd64 archivers/libarchive/files/libarchive/archive_pack_dev.c
--- a/archivers/libarchive/files/libarchive/archive_pack_dev.c  Sun Sep 22 09:47:22 2019 +0000
+++ b/archivers/libarchive/files/libarchive/archive_pack_dev.c  Sun Sep 22 09:50:54 2019 +0000
@@ -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
diff -r a85598f784b0 -r ed50fe76fd64 archivers/libarchive/files/libarchive/archive_pack_dev.h
--- a/archivers/libarchive/files/libarchive/archive_pack_dev.h  Sun Sep 22 09:47:22 2019 +0000
+++ b/archivers/libarchive/files/libarchive/archive_pack_dev.h  Sun Sep 22 09:50:54 2019 +0000
@@ -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.