Re: pkg/39090: pkg_admin from pkg_install-renovation fails to run with 'fetch-pkg-vulnerabilities'

["Stuart Shelton" <srcshelton%gmail.com@localhost>]

>  (a) if the BOOTSTRAP= line in admin/Makefile contained anything

# grep BOOTSTRAP
/usr/bsd/var/tmp/pkgtools/pkg_install/work/pkg_install-20080627/admin/Makefile
BOOTSTRAP=
.if empty(BOOTSTRAP)
CPPFLAGS=       -c99 -I/usr/bsd/include -D__inline__=inline
-D_LARGEFILE_SOURCE -D_LARGE_FILES -D_FILE_OFFSET_BITS=64
-DDEF_UMASK=022 -I/usr/bsd/var/tmp/pkgtools/pkg_install/work/bzip2
-I/usr/bsd/var/tmp/pkgtools/pkg_install/work/libarchive/libarchive
-I/usr/bsd/var/tmp/pkgtools/pkg_install/work/libfetch
-DHAVE_NBCOMPAT_H=1
-I/usr/bsd/var/tmp/pkgtools/pkg_install/work/libnbcompat
-I/usr/include -I. -I$(srcdir) -I../lib -DBOOTSTRAP

(that last line from the '.else' branch of '.if empty(BOOTSTRAP)')

>  (b) if audit.o was built

find /usr/bsd/var/tmp/pkgtools/pkg_install/work/pkg_install-20080627
-name audit.o
./admin/audit.o


>  There's no diagnostic for this case as it is not suppossed to happen
>  (TM).

Hmm...

It's worth noting that, in order for pkg_install-renovation to build I
needed to apply the following two patches:

--- 
/usr/bsd/src/../var/tmp/pkgtools/pkg_install/work/libarchive/libarchive/archive_read_support_compression_program.c.dist
    2008-06-03 14:47:49.719840800 +0100
+++ 
/usr/bsd/src/../var/tmp/pkgtools/pkg_install/work/libarchive/libarchive/archive_read_support_compression_program.c
 2008-06-03 15:56:52.582887200 +0100
@@ -26,6 +26,9 @@
 #include "archive_platform.h"
 __FBSDID("$FreeBSD:
src/lib/libarchive/archive_read_support_compression_program.c,v 1.2
2007/07/20 01:28:50 kientzle Exp $");

+#include "archive.h"
+#include "archive_private.h"
+#include "archive_read_private.h"

 /* This capability is only available on POSIX systems. */
 #if !defined(HAVE_PIPE) || !defined(HAVE_VFORK) || !defined(HAVE_FCNTL)
@@ -66,10 +69,6 @@ archive_read_support_compression_program
 #  include <unistd.h>
 #endif

-#include "archive.h"
-#include "archive_private.h"
-#include "archive_read_private.h"
-
 #include "filter_fork.h"

 struct archive_decompress_program {


--- 
/usr/bsd/src/../var/tmp/pkgtools/pkg_install/work/libarchive/libarchive/archive_write_set_compression_program.c.dist
       2008-06-03 15:57:28.908672000 +0100
+++ 
/usr/bsd/src/../var/tmp/pkgtools/pkg_install/work/libarchive/libarchive/archive_write_set_compression_program.c
    2008-06-03 15:58:04.133544000 +0100
@@ -27,6 +27,10 @@

 __FBSDID("$FreeBSD:
src/lib/libarchive/archive_write_set_compression_program.c,v 1.1
2007/05/29 01:00:19 kientzle Exp $");

+#include "archive.h"
+#include "archive_private.h"
+#include "archive_write_private.h"
+
 /* This capability is only available on POSIX systems. */
 #if !defined(HAVE_PIPE) || !defined(HAVE_VFORK) || !defined(HAVE_FCNTL)

@@ -60,10 +64,6 @@ archive_write_set_compression_program(st
 #  include <string.h>
 #endif

-#include "archive.h"
-#include "archive_private.h"
-#include "archive_write_private.h"
-
 #include "filter_fork.h"

 struct private_data {

... as without these the build process stops with an error (regarding
undefined functions, IIRC).  Is this patch to fix the build process
actually breaking the resultant binary?