CVS commit: pkgsrc/pkgtools/pkg_install/files/lib

["Sijmen J. Mulder" <sjmulder%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sjmulder
Date:           Tue Jul 21 14:32:00 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkg_install/files/lib: vulnerabilities-file.c

Log Message:
pkg_install: BOOTSTRAP guard on libarchive-using function

Initial bootstrap builds of pkg_install don't use libarchive. Guarding
this function (as other places are) with #ifndef BOOTSTRAP prevents
'implicit declaration of archive_...()' warnings on FreeBSD 12 and Xcode
beta, which due to -Werror broke the bootstrap.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/pkgtools/pkg_install/files/lib/vulnerabilities-file.c

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

Modified files:

Index: pkgsrc/pkgtools/pkg_install/files/lib/vulnerabilities-file.c
diff -u pkgsrc/pkgtools/pkg_install/files/lib/vulnerabilities-file.c:1.10 pkgsrc/pkgtools/pkg_install/files/lib/vulnerabilities-file.c:1.11
--- pkgsrc/pkgtools/pkg_install/files/lib/vulnerabilities-file.c:1.10   Mon Feb 26 23:45:02 2018
+++ pkgsrc/pkgtools/pkg_install/files/lib/vulnerabilities-file.c        Tue Jul 21 14:32:00 2020
@@ -1,4 +1,4 @@
-/*     $NetBSD: vulnerabilities-file.c,v 1.10 2018/02/26 23:45:02 ginsbach Exp $       */
+/*     $NetBSD: vulnerabilities-file.c,v 1.11 2020/07/21 14:32:00 sjmulder Exp $       */
 
 /*-
  * Copyright (c) 2008, 2010 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -38,7 +38,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: vulnerabilities-file.c,v 1.10 2018/02/26 23:45:02 ginsbach Exp $");
+__RCSID("$NetBSD: vulnerabilities-file.c,v 1.11 2020/07/21 14:32:00 sjmulder Exp $");
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -77,6 +77,7 @@ static const char pgp_msg_end[] = "-----
 static const char pkcs7_begin[] = "-----BEGIN PKCS7-----\n";
 static const char pkcs7_end[] = "-----END PKCS7-----\n";
 
+#ifndef BOOTSTRAP
 static struct archive *
 prepare_raw_file(void)
 {
@@ -90,6 +91,7 @@ prepare_raw_file(void)
        archive_read_support_format_raw(a);
        return a;
 }
+#endif
 
 static void
 verify_signature_pkcs7(const char *input)