diff options
| author | joerg <joerg@pkgsrc.org> | 2019-09-22 09:50:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2019-09-22 09:50:54 +0000 |
| commit | e2862261e75b8199fdd9d00f21b3cba0c8a0ac81 (patch) | |
| tree | c1eac9f56b59d87cbbc73fd0cc46f861f8fef23f /archivers | |
| parent | 78f55261ec5155163d9ddcec01d83808d5583969 (diff) | |
| download | pkgsrc-e2862261e75b8199fdd9d00f21b3cba0c8a0ac81.tar.gz | |
Properly merge libarchive-3.3.3
Diffstat (limited to 'archivers')
3 files changed, 5 insertions, 5 deletions
diff --git a/archivers/libarchive/files/contrib/libarchive.1aix53.spec b/archivers/libarchive/files/contrib/libarchive.1aix53.spec index 9dc4a1ac6da..45cc239d66e 100644 --- a/archivers/libarchive/files/contrib/libarchive.1aix53.spec +++ b/archivers/libarchive/files/contrib/libarchive.1aix53.spec @@ -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 - tweak for aix-5.3 diff --git a/archivers/libarchive/files/libarchive/archive_pack_dev.c b/archivers/libarchive/files/libarchive/archive_pack_dev.c index e5a288b5f3b..db5f03194b6 100644 --- a/archivers/libarchive/files/libarchive/archive_pack_dev.c +++ b/archivers/libarchive/files/libarchive/archive_pack_dev.c @@ -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 --git a/archivers/libarchive/files/libarchive/archive_pack_dev.h b/archivers/libarchive/files/libarchive/archive_pack_dev.h index 0a8d252e787..51e26075374 100644 --- a/archivers/libarchive/files/libarchive/archive_pack_dev.h +++ b/archivers/libarchive/files/libarchive/archive_pack_dev.h @@ -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. |