pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkg_install-renovation]: pkgsrc/pkgtools/pkg_install pkg_install-2008...
details: https://anonhg.NetBSD.org/pkgsrc/rev/77b6cc6f976f
branches: pkg_install-renovation
changeset: 541552:77b6cc6f976f
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon May 26 15:29:03 2008 +0000
description:
pkg_install-20080526:
Add pkg_install.conf.5 man page from Thomas Klausner, reference it from
pkg_add and pkg_admin. Fix a build issue for the !SSL case.
diffstat:
pkgtools/pkg_install/PLIST | 4 +-
pkgtools/pkg_install/files/add/perform.c | 7 +-
pkgtools/pkg_install/files/add/pkg_add.1 | 16 +-
pkgtools/pkg_install/files/add/pkg_add.cat1 | 29 +--
pkgtools/pkg_install/files/admin/pkg_admin.1 | 19 ++-
pkgtools/pkg_install/files/admin/pkg_admin.cat1 | 22 ++-
pkgtools/pkg_install/files/lib/Makefile.in | 4 +-
pkgtools/pkg_install/files/lib/pkg_install.conf.5 | 128 +++++++++++++++++++
pkgtools/pkg_install/files/lib/pkg_install.conf.cat5 | 82 ++++++++++++
pkgtools/pkg_install/files/lib/version.h | 4 +-
10 files changed, 272 insertions(+), 43 deletions(-)
diffs (truncated from 494 to 300 lines):
diff -r a7d2b3d26164 -r 77b6cc6f976f pkgtools/pkg_install/PLIST
--- a/pkgtools/pkg_install/PLIST Sun May 25 19:52:55 2008 +0000
+++ b/pkgtools/pkg_install/PLIST Mon May 26 15:29:03 2008 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.10.8.2 2008/05/24 21:54:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10.8.3 2008/05/26 15:29:03 joerg Exp $
man/cat1/pkg_add.0
man/cat1/pkg_admin.0
man/cat1/pkg_create.0
man/cat1/pkg_delete.0
man/cat1/pkg_info.0
+man/cat5/pkg_install.conf.0
man/cat5/pkg_summary.0
man/cat7/pkgsrc.0
man/man1/pkg_add.1
@@ -11,6 +12,7 @@
man/man1/pkg_create.1
man/man1/pkg_delete.1
man/man1/pkg_info.1
+man/man5/pkg_install.conf.5
man/man5/pkg_summary.5
man/man7/pkgsrc.7
sbin/audit-packages
diff -r a7d2b3d26164 -r 77b6cc6f976f pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c Sun May 25 19:52:55 2008 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c Mon May 26 15:29:03 2008 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.70.4.6 2008/05/20 15:00:44 joerg Exp $ */
+/* $NetBSD: perform.c,v 1.70.4.7 2008/05/26 15:29:03 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -6,7 +6,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: perform.c,v 1.70.4.6 2008/05/20 15:00:44 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.70.4.7 2008/05/26 15:29:03 joerg Exp $");
/*-
* Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -1138,9 +1138,7 @@
{
int status, invalid_sig;
void *archive_cookie;
-#ifdef HAVE_SSL
void *signature_cookie;
-#endif
struct pkg_task *pkg;
if ((pkg = calloc(1, sizeof(*pkg))) == NULL)
@@ -1158,6 +1156,7 @@
&pkg->pkgname, &signature_cookie);
#else
invalid_sig = 1;
+ signature_cookie = NULL;
#endif
if (read_meta_data(pkg))
diff -r a7d2b3d26164 -r 77b6cc6f976f pkgtools/pkg_install/files/add/pkg_add.1
--- a/pkgtools/pkg_install/files/add/pkg_add.1 Sun May 25 19:52:55 2008 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.1 Mon May 26 15:29:03 2008 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.28.6.3 2008/05/19 16:25:24 joerg Exp $
+.\" $NetBSD: pkg_add.1,v 1.28.6.4 2008/05/26 15:29:03 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -17,7 +17,7 @@
.\"
.\" @(#)pkg_add.1
.\"
-.Dd May 9, 2008
+.Dd May 26, 2008
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -478,27 +478,19 @@
.Sh CONFIGURATION VARIABLES
The following variables change the behaviour of
.Nm
-and can be found in greater detail in
+and are described in
.Xr pkg_install.conf 5 :
.Bl -tag -width CERTIFICATE_ANCHOR_PKGS
.It Ev CERTIFICATE_ANCHOR_PKGS
-Location of the trust anchor for binary packages.
.It Ev CERTIFICATE_CHAIN
-Location of a file with additional certificates used to fill holes in
-the trust chain.
.It Ev VERIFIED_INSTALLATION
-Specify interactiveness and use of digital signature.
-The value "never" just uses the binary package without requiring a signature.
-The value "always" requires a valid signature and terminates the installation
-otherwise.
-The value "trusted" asks before installing packages without valid signature.
-The value "interactive" will always ask the user.
.El
.Sh SEE ALSO
.Xr pkg_admin 1 ,
.Xr pkg_create 1 ,
.Xr pkg_delete 1 ,
.Xr pkg_info 1 ,
+.Xr pkg_install.conf 5 ,
.Xr tar 1 ,
.Xr mktemp 3 ,
.Xr sysconf 3 ,
diff -r a7d2b3d26164 -r 77b6cc6f976f pkgtools/pkg_install/files/add/pkg_add.cat1
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1 Sun May 25 19:52:55 2008 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1 Mon May 26 15:29:03 2008 +0000
@@ -280,27 +280,18 @@
_s_e_c_u_r_i_t_y_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s package and running it after every ppkkgg__aadddd.
CCOONNFFIIGGUURRAATTIIOONN VVAARRIIAABBLLEESS
- The following variables change the behaviour of ppkkgg__aadddd and can be found
- in greater detail in pkg_install.conf(5):
-
- CERTIFICATE_ANCHOR_PKGS Location of the trust anchor for binary pack-
- ages.
-
- CERTIFICATE_CHAIN Location of a file with additional certificates
- used to fill holes in the trust chain.
+ The following variables change the behaviour of ppkkgg__aadddd and are explained
+ in pkg_install.conf(5):
- VERIFIED_INSTALLATION Specify interactiveness and use of digital sig-
- nature. The value "never" just uses the binary
- package without requiring a signature. The
- value "always" requires a valid signature and
- terminates the installation otherwise. The
- value "trusted" asks before installing packages
- without valid signature. The value "interac-
- tive" will always ask the user.
+ CERTIFICATE_ANCHOR_PKGS
+
+ CERTIFICATE_CHAIN
+
+ VERIFIED_INSTALLATION
SSEEEE AALLSSOO
- pkg_admin(1), pkg_create(1), pkg_delete(1), pkg_info(1), tar(1),
- mktemp(3), sysconf(3), pkgsrc(7)
+ pkg_admin(1), pkg_create(1), pkg_delete(1), pkg_info(1),
+ pkg_install.conf(5), tar(1), mktemp(3), sysconf(3), pkgsrc(7)
AAUUTTHHOORRSS
Jordan Hubbard
@@ -327,4 +318,4 @@
Sure to be others.
-NetBSD 4.0 May 9, 2008 NetBSD 4.0
+NetBSD 4.0 May 26, 2008 NetBSD 4.0
diff -r a7d2b3d26164 -r 77b6cc6f976f pkgtools/pkg_install/files/admin/pkg_admin.1
--- a/pkgtools/pkg_install/files/admin/pkg_admin.1 Sun May 25 19:52:55 2008 +0000
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.1 Mon May 26 15:29:03 2008 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_admin.1,v 1.18 2008/04/16 00:53:06 joerg Exp $
+.\" $NetBSD: pkg_admin.1,v 1.18.2.1 2008/05/26 15:29:03 joerg Exp $
.\"
.\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 10, 2007
+.Dd May 26, 2008
.Dt PKG_ADMIN 1
.Os
.Sh NAME
@@ -275,6 +275,20 @@
The default package database directory is
.Pa /var/db/pkg .
.El
+.Sh CONFIGURATION VARIABLES
+The following variables change the behaviour of
+.Nm
+and are described in
+.Xr pkg_install.conf 5 :
+.Bl -tag -width CERTIFICATE_ANCHOR_PKGS
+.It Ev CERTIFICATE_ANCHOR_PKGS
+.It Ev CERTIFICATE_ANCHOR_PKGVULN
+.It Ev CERTIFICATE_CHAIN
+.It Ev GPG
+.It Ev PKGVULNDIR
+.It Ev PKGVULNURL
+.It Ev IGNORE_URL
+.El
.Sh FILES
.Bl -tag -width /var/db/pkg/pkgdb.byfile.db -compact
.It Pa /var/db/pkg/pkgdb.byfile.db
@@ -286,6 +300,7 @@
.Xr pkg_delete 1 ,
.Xr pkg_info 1 ,
.Xr pkg_view 1 ,
+.Xr pkg_install.conf 5 ,
.Xr pkgsrc 7
.Sh HISTORY
The
diff -r a7d2b3d26164 -r 77b6cc6f976f pkgtools/pkg_install/files/admin/pkg_admin.cat1
--- a/pkgtools/pkg_install/files/admin/pkg_admin.cat1 Sun May 25 19:52:55 2008 +0000
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.cat1 Mon May 26 15:29:03 2008 +0000
@@ -181,13 +181,31 @@
package database directory. The default package database direc-
tory is _/_v_a_r_/_d_b_/_p_k_g.
+CCOONNFFIIGGUURRAATTIIOONN VVAARRIIAABBLLEESS
+ The following variables change the behaviour of ppkkgg__aaddmmiinn and are
+ described in pkg_install.conf(5):
+
+ CERTIFICATE_ANCHOR_PKGS
+
+ CERTIFICATE_ANCHOR_PKGVULN
+
+ CERTIFICATE_CHAIN
+
+ GPG
+
+ PKGVULNDIR
+
+ PKGVULNURL
+
+ IGNORE_URL
+
FFIILLEESS
/var/db/pkg/pkgdb.byfile.db
/var/db/pkg/<pkg>/+CONTENTS
SSEEEE AALLSSOO
pkg_add(1), pkg_create(1), pkg_delete(1), pkg_info(1), pkg_view(1),
- pkgsrc(7)
+ pkg_install.conf(5), pkgsrc(7)
HHIISSTTOORRYY
The ppkkgg__aaddmmiinn command first appeared in NetBSD 1.4.
@@ -195,4 +213,4 @@
AAUUTTHHOORRSS
The ppkkgg__aaddmmiinn command was written by Hubert Feyrer.
-NetBSD 4.0 March 10, 2007 NetBSD 4.0
+NetBSD 4.0 May 26, 2008 NetBSD 4.0
diff -r a7d2b3d26164 -r 77b6cc6f976f pkgtools/pkg_install/files/lib/Makefile.in
--- a/pkgtools/pkg_install/files/lib/Makefile.in Sun May 25 19:52:55 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/Makefile.in Mon May 26 15:29:03 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.21.2.4 2008/05/12 15:26:10 joerg Exp $
+# $NetBSD: Makefile.in,v 1.21.2.5 2008/05/26 15:29:03 joerg Exp $
srcdir= @srcdir@
@@ -63,5 +63,7 @@
$(INSTALL) -m 755 -d ${DESTDIR}$(cat7dir)
$(INSTALL) -m 444 pkg_summary.5 ${DESTDIR}$(man5dir)/pkg_summary.5
$(INSTALL) -m 444 pkg_summary.cat5 ${DESTDIR}$(cat5dir)/pkg_summary.0
+ $(INSTALL) -m 444 pkg_install.conf.5 ${DESTDIR}$(man5dir)/pkg_install.conf.5
+ $(INSTALL) -m 444 pkg_install.conf.cat5 ${DESTDIR}$(cat5dir)/pkg_install.conf.0
$(INSTALL) -m 444 pkgsrc.7 ${DESTDIR}$(man7dir)/pkgsrc.7
$(INSTALL) -m 444 pkgsrc.cat7 ${DESTDIR}$(cat7dir)/pkgsrc.0
diff -r a7d2b3d26164 -r 77b6cc6f976f pkgtools/pkg_install/files/lib/pkg_install.conf.5
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.5 Mon May 26 15:29:03 2008 +0000
@@ -0,0 +1,128 @@
+.\" $NetBSD: pkg_install.conf.5,v 1.1.2.1 2008/05/26 15:29:03 joerg Exp $
+.\"
+.\" Copyright (c) 2008 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Thomas Klausner.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd May 26, 2008
+.Dt PKG_INSTALL.CONF 5
+.Os
+.Sh NAME
+.Nm pkg_install.conf
+.Nd configuration file for package installation tools
+.Sh DESCRIPTION
+The file
Home |
Main Index |
Thread Index |
Old Index