Mon Apr 15 13:37:24 2024 UTC (41d)
libarchive: fix builds where __RCSID isn't defined by the OS

The 3.7.3 release removed all __FBSDID and __RCSID strings and support
for them. Evidently there was a merge botch with archive_pack_dev.c
where __RCSID was retained there in our copy, which breaks builds on
most OSes. Addresses PR pkg/58152 from Hiroshi Hakoyama.


(gutteridge)
diff -r1.9 -r1.10 pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c
cvs diff -r1.9 -r1.10 pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c (expand / switch to unified diff)

--- pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c 2024/01/18 18:00:17 1.9
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c 2024/04/15 13:37:24 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: archive_pack_dev.c,v 1.9 2024/01/18 18:00:17 adam Exp $ */ 1/* $NetBSD: archive_pack_dev.c,v 1.10 2024/04/15 13:37:24 gutteridge Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Charles M. Hannum. 8 * by Charles M. Hannum.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -23,33 +23,26 @@ @@ -23,33 +23,26 @@
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32/* Originally from NetBSD's mknod(8) source. */ 32/* Originally from NetBSD's mknod(8) source. */
33 33
34#include "archive_platform.h" 34#include "archive_platform.h"
35 35
36#if HAVE_SYS_CDEFS_H 
37#include <sys/cdefs.h> 
38#endif 
39#if !defined(lint) 
40__RCSID("$NetBSD: archive_pack_dev.c,v 1.9 2024/01/18 18:00:17 adam Exp $"); 
41#endif /* not lint */ 
42 
43#ifdef HAVE_LIMITS_H 36#ifdef HAVE_LIMITS_H
44#include <limits.h> 37#include <limits.h>
45#endif 38#endif
46 39
47#include <stdio.h> 40#include <stdio.h>
48#ifdef HAVE_STDLIB_H 41#ifdef HAVE_STDLIB_H
49#include <stdlib.h> 42#include <stdlib.h>
50#endif 43#endif
51#ifdef HAVE_STRING_H 44#ifdef HAVE_STRING_H
52#include <string.h> 45#include <string.h>
53#endif 46#endif
54#ifdef HAVE_SYS_TYPES_H 47#ifdef HAVE_SYS_TYPES_H
55#include <sys/types.h> 48#include <sys/types.h>