[src/netbsd-1-5]: src/usr.sbin/pkg_install/add Pull up revisions 1.59-1.61 (r...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/36c746274bb5
branches:  netbsd-1-5
changeset: 492828:36c746274bb5
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 23 17:59:36 2002 +0000

description:
Pull up revisions 1.59-1.61 (requested by seb):
  Synchronize with recent developments:
   o Support digital signatures in binary packages
   o Fix ``pkg_add -u'' for packages without dependencies; fixes PR#13536
   o Various internal cleanups, bugfixes, and API tweaks

diffstat:

 usr.sbin/pkg_install/add/perform.c |  57 ++++++++++++++++++++++++++------------
 1 files changed, 39 insertions(+), 18 deletions(-)

diffs (138 lines):

diff -r 8fc631f6fd61 -r 36c746274bb5 usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Sat Feb 23 17:58:31 2002 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Sat Feb 23 17:59:36 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.52.2.6 2001/03/30 22:42:33 he Exp $      */
+/*     $NetBSD: perform.c,v 1.52.2.7 2002/02/23 17:59:36 he Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.52.2.6 2001/03/30 22:42:33 he Exp $");
+__RCSID("$NetBSD: perform.c,v 1.52.2.7 2002/02/23 17:59:36 he Exp $");
 #endif
 #endif
 
@@ -33,6 +33,7 @@
 #include <err.h>
 #include "lib.h"
 #include "add.h"
+#include "verify.h"
 
 #include <signal.h>
 #include <string.h>
@@ -111,7 +112,7 @@
                            dbdir);
                }
        }
-       
+
        /* Are we coming in for a second pass, everything already extracted?
         * (Slave mode) */
        if (!pkg) {
@@ -193,6 +194,13 @@
                        }
                        where_to = Home;
                        strcpy(pkg_fullname, tmppkg);
+
+                       /* make sure the pkg is verified */
+                       if (!verify(tmppkg)) {
+                               warnx("Package %s will not be extracted", tmppkg);
+                               goto bomb;
+                       }
+               
                        cfile = fopen(CONTENTS_FNAME, "r");
                        if (!cfile) {
                                warnx("unable to open table of contents file `%s' - not a package?",
@@ -205,10 +213,16 @@
                        strcpy(pkg_fullname, pkg);      /* copy for sanity's sake, could remove pkg_fullname */
                        if (strcmp(pkg, "-")) {
                                /* not stdin */
-                               if (!ispkgpattern(pkg_fullname)
-                                   && stat(pkg_fullname, &sb) == FAIL) {
-                                       warnx("can't stat package file '%s'", pkg_fullname);
-                                       goto bomb;
+                               if (!ispkgpattern(pkg_fullname)) {
+                                       if (stat(pkg_fullname, &sb) == FAIL) {
+                                               warnx("can't stat package file '%s'", pkg_fullname);
+                                               goto bomb;
+                                       }
+                                       /* make sure the pkg is verified */
+                                       if (!verify(pkg_fullname)) {
+                                               warnx("Package %s will not be extracted", pkg_fullname);
+                                               goto bomb;
+                                       }
                                }
                                (void) snprintf(extract_contents, sizeof(extract_contents), "--fast-read %s", CONTENTS_FNAME);
                                extract = extract_contents;
@@ -294,7 +308,7 @@
                /* If we're running in MASTER mode, just output the plist and return */
                if (AddMode == MASTER) {
                        printf("%s\n", where_playpen());
-                       write_plist(&Plist, stdout);
+                       write_plist(&Plist, stdout, NULL);
                        return 0;
                }
        }
@@ -341,18 +355,19 @@
                                        if (Verbose)
                                                printf("Upgrading %s to %s.\n", installed, PkgName);
 
-                                       if (fexists(upgrade_from)) {
-                                               if (0 && Verbose)
-                                                       printf("HF: mv %s %s\n", upgrade_from, upgrade_via);
+                                       if (fexists(upgrade_from)) {  /* Are there any dependencies? */
+                                               if (Verbose)
+                                                       printf("mv %s %s\n", upgrade_from, upgrade_via);
                                                rc = rename(upgrade_from, upgrade_via);
                                                assert(rc == 0);
-
-                                               if (0 && Verbose)
-                                                       printf("HF: pkg_delete '%s'\n", installed);
-                                               vsystem("pkg_delete '%s'\n", installed);
-
+                                               
                                                upgrading = 1;
                                        }
+
+                                       if (Verbose)
+                                               printf("pkg_delete '%s'\n", installed);
+                                       vsystem("pkg_delete '%s'\n", installed);
+                                       
                                } else {
                                        warnx("other version '%s' already installed", installed);
 
@@ -478,8 +493,9 @@
                                        if (cp) {
                                                if (Verbose)
                                                        printf("Loading it from %s.\n", cp);
-                                               if (vsystem("%s/pkg_add %s%s%s %s%s",
+                                               if (vsystem("%s/pkg_add -s %s %s%s%s %s%s",
                                                            BINDIR,
+                                                           get_verification(),
                                                            Force ? "-f " : "",
                                                            Prefix ? "-p " : "",
                                                            Prefix ? Prefix : "",
@@ -502,6 +518,11 @@
                                        char   *saved_Current;  /* allocated/set by save_dirs(), */
                                        char   *saved_Previous; /* freed by restore_dirs() */
                                        char   *cp, *new_pkg, *new_name;
+                                       char   *vertype;
+
+                                       if (strcmp(vertype = get_verification(), "none") != 0) {
+                                               (void) fprintf(stderr, "Warning: %s verification requested for a URL package\n", vertype);
+                                       }
 
                                        new_pkg = pkg;
                                        new_name = p->name;
@@ -669,7 +690,7 @@
                            contents);
                        goto success;   /* can't log, but still keep pkg */
                }
-               write_plist(&Plist, cfile);
+               write_plist(&Plist, cfile, NULL);
                fclose(cfile);
                move_file(".", DESC_FNAME, LogDir);
                move_file(".", COMMENT_FNAME, LogDir);