[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Fix !OpenSSL build/boot...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77ee951d0c3e
branches:  trunk
changeset: 554137:77ee951d0c3e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 09 16:54:08 2009 +0000

description:
Fix !OpenSSL build/bootstrap.

diffstat:

 pkgtools/pkg_install/files/lib/Makefile.in     |   6 +++---
 pkgtools/pkg_install/files/lib/pkg_signature.c |  12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (75 lines):

diff -r 73df24be94eb -r 77ee951d0c3e pkgtools/pkg_install/files/lib/Makefile.in
--- a/pkgtools/pkg_install/files/lib/Makefile.in        Mon Feb 09 16:46:35 2009 +0000
+++ b/pkgtools/pkg_install/files/lib/Makefile.in        Mon Feb 09 16:54:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.24 2009/02/02 12:35:01 joerg Exp $
+# $NetBSD: Makefile.in,v 1.25 2009/02/09 16:54:08 joerg Exp $
 
 srcdir=                @srcdir@
 
@@ -36,12 +36,12 @@
 .if !empty(BOOTSTRAP)
 CPPFLAGS+=     -DBOOTSTRAP
 .else
-OBJS+= pkg_io.o
+OBJS+= pkg_io.o pkg_signature.o
 .endif
 
 .if !empty(SSL_SUPPORT)
 CPPFLAGS+=     -DHAVE_SSL
-OBJS+=         pkg_signature.o pkcs7.o
+OBJS+=         pkcs7.o
 .endif
 
 all: $(LIB)
diff -r 73df24be94eb -r 77ee951d0c3e pkgtools/pkg_install/files/lib/pkg_signature.c
--- a/pkgtools/pkg_install/files/lib/pkg_signature.c    Mon Feb 09 16:46:35 2009 +0000
+++ b/pkgtools/pkg_install/files/lib/pkg_signature.c    Mon Feb 09 16:54:08 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkg_signature.c,v 1.2 2009/02/02 12:35:01 joerg Exp $  */
+/*     $NetBSD: pkg_signature.c,v 1.3 2009/02/09 16:54:08 joerg Exp $  */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pkg_signature.c,v 1.2 2009/02/02 12:35:01 joerg Exp $");
+__RCSID("$NetBSD: pkg_signature.c,v 1.3 2009/02/09 16:54:08 joerg Exp $");
 
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -356,10 +356,16 @@
 
                free(signature_file);
        } else {
+#ifdef HAVE_SSL
                has_sig = !easy_pkcs7_verify(hash_file, hash_len, signature_file,
                    signature_len, certs_packages, 1);
 
                free(signature_file);
+#else
+               warnx("No OpenSSL support compiled in, skipping signature");
+               has_sig = 0;
+               free(signature_file);
+#endif
        }
 
        r = archive_read_next_header(*archive, &my_entry);
@@ -503,6 +509,7 @@
 
 static const char hash_trailer[] = "end pkgsrc signature\n";
 
+#ifdef HAVE_SSL
 void
 pkg_sign_x509(const char *name, const char *output, const char *key_file, const char *cert_file)
 {
@@ -593,6 +600,7 @@
 
        exit(0);
 }
+#endif
 
 void
 pkg_sign_gpg(const char *name, const char *output)