pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files Update to 20050530:
details: https://anonhg.NetBSD.org/pkgsrc/rev/27484862dcfd
branches: trunk
changeset: 494774:27484862dcfd
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon May 30 13:23:31 2005 +0000
description:
Update to 20050530:
Sync with base system: Ranges support and some other stuff that wasn't
pulled over.
diffstat:
pkgtools/pkg_install/files/README | 6 +-
pkgtools/pkg_install/files/admin/pkg_admin.1 | 6 +-
pkgtools/pkg_install/files/admin/pkg_admin.cat1 | 6 +-
pkgtools/pkg_install/files/delete/perform.c | 6 +-
pkgtools/pkg_install/files/delete/pkg_delete.1 | 6 +-
pkgtools/pkg_install/files/delete/pkg_delete.cat1 | 6 +-
pkgtools/pkg_install/files/info/info.h | 6 +-
pkgtools/pkg_install/files/info/perform.c | 30 ++++----
pkgtools/pkg_install/files/info/pkg_info.1 | 46 +++++++++++--
pkgtools/pkg_install/files/info/pkg_info.cat1 | 38 ++++++----
pkgtools/pkg_install/files/info/show.c | 12 +-
pkgtools/pkg_install/files/lib/ftpio.c | 7 +-
pkgtools/pkg_install/files/lib/pen.c | 10 +--
pkgtools/pkg_install/files/lib/str.c | 74 +++++++++++++++-------
pkgtools/pkg_install/files/lib/version.h | 4 +-
pkgtools/pkg_install/files/view/pkg_view.1 | 6 +-
pkgtools/pkg_install/files/view/pkg_view.cat1 | 4 +-
17 files changed, 166 insertions(+), 107 deletions(-)
diffs (truncated from 721 to 300 lines):
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/README
--- a/pkgtools/pkg_install/files/README Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/README Mon May 30 13:23:31 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: README,v 1.6 2005/02/04 01:19:03 jlam Exp $
+# $NetBSD: README,v 1.7 2005/05/30 13:23:31 wiz Exp $
# Original from FreeBSD, no rcs id.
This is the pkg_install suite of tools for doing maintainance of
@@ -17,5 +17,5 @@
When making snapshots, please modify PKGTOOLS_VERSION in lib/version.h
to that day's date.
-This is the canonical location for these sources. Any changes should
-be made here first, then merged over to pkgsrc.
+src/usr.sbin/pkg_install is the canonical location for these sources.
+Any changes should be made here first, then merged over to pkgsrc.
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/admin/pkg_admin.1
--- a/pkgtools/pkg_install/files/admin/pkg_admin.1 Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.1 Mon May 30 13:23:31 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_admin.1,v 1.9 2005/02/04 01:19:03 jlam Exp $
+.\" $NetBSD: pkg_admin.1,v 1.10 2005/05/30 13:23:31 wiz Exp $
.\"
.\" Copyright (c) 1999-2002 Hubert Feyrer. All rights reserved.
.\"
@@ -78,7 +78,9 @@
Perform checks in a quiet manner.
In normal operation,
.Nm
-prints a '.' to standard output to indicate progress.
+prints a
+.Sq \&.
+to standard output to indicate progress.
This option suppresses this progress indicator.
.It Fl S
Set the shell glob pattern for package suffixes when matching package
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/admin/pkg_admin.cat1
--- a/pkgtools/pkg_install/files/admin/pkg_admin.cat1 Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.cat1 Mon May 30 13:23:31 2005 +0000
@@ -1,7 +1,7 @@
PKG_ADMIN(1) NetBSD General Commands Manual PKG_ADMIN(1)
NNAAMMEE
- ppkkgg__aaddmmiinn - perform various administrative tasks to the pkg system
+ ppkkgg__aaddmmiinn -- perform various administrative tasks to the pkg system
SSYYNNOOPPSSIISS
ppkkgg__aaddmmiinn [--bbqqSSVV] [--dd _l_s_d_i_r] [--KK _p_k_g___d_b_d_i_r] [--ss _s_f_x___p_a_t_t_e_r_n] _c_o_m_m_a_n_d
@@ -28,7 +28,7 @@
otherwise it defaults to _/_v_a_r_/_d_b_/_p_k_g.
--qq Perform checks in a quiet manner. In normal operation, ppkkgg__aaddmmiinn
- prints a '.' to standard output to indicate progress. This
+ prints a `.' to standard output to indicate progress. This
option suppresses this progress indicator.
--SS Set the shell glob pattern for package suffixes when matching
@@ -141,4 +141,4 @@
AAUUTTHHOORRSS
The ppkkgg__aaddmmiinn command was written by Hubert Feyrer.
-NetBSD 2.0 August 13, 2004 NetBSD 2.0
+NetBSD 3.0 August 13, 2004 NetBSD 3.0
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/delete/perform.c
--- a/pkgtools/pkg_install/files/delete/perform.c Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/delete/perform.c Mon May 30 13:23:31 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.15 2005/05/10 00:04:09 rillig Exp $ */
+/* $NetBSD: perform.c,v 1.16 2005/05/30 13:23:31 wiz Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.15 2005/05/10 00:04:09 rillig Exp $");
+__RCSID("$NetBSD: perform.c,v 1.16 2005/05/30 13:23:31 wiz Exp $");
#endif
#endif
@@ -845,7 +845,7 @@
if (is_depoted_pkg) {
(void) remove_files(LogDir, "+*");
if (isemptydir(LogDir))
- (void) fexec(RMDIR_CMD, LogDir, NULL);
+ (void)rmdir(LogDir);
else
warnx("%s is not empty", LogDir);
return 0;
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/delete/pkg_delete.1
--- a/pkgtools/pkg_install/files/delete/pkg_delete.1 Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.1 Mon May 30 13:23:31 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_delete.1,v 1.11 2005/02/05 00:28:58 jlam Exp $
+.\" $NetBSD: pkg_delete.1,v 1.12 2005/05/30 13:23:31 wiz Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -45,7 +45,9 @@
Since the
.Nm
command may execute scripts or programs provided by a package file,
-your system may be susceptible to ``Trojan horses'' or other subtle
+your system may be susceptible to
+.Dq Trojan horses
+or other subtle
attacks from miscreants who create dangerous package files.
.Pp
You are advised to verify the competence and identity of those who
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/delete/pkg_delete.cat1
--- a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.cat1 Mon May 30 13:23:31 2005 +0000
@@ -1,8 +1,8 @@
PKG_DELETE(1) NetBSD General Commands Manual PKG_DELETE(1)
NNAAMMEE
- ppkkgg__ddeelleettee - a utility for deleting previously installed software package
- distributions
+ ppkkgg__ddeelleettee -- a utility for deleting previously installed software pack-
+ age distributions
SSYYNNOOPPSSIISS
ppkkgg__ddeelleettee [--DDddFFffNNnnOORRrrVVvv] [--KK _p_k_g___d_b_d_i_r] [--pp _p_r_e_f_i_x] _p_k_g_-_n_a_m_e _._._.
@@ -168,4 +168,4 @@
NetBSD wildcard dependency processing, pkgdb, recursive "down"
delete, etc.
-NetBSD 2.0 February 4, 2005 NetBSD 2.0
+NetBSD 3.0 February 4, 2005 NetBSD 3.0
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/info/info.h
--- a/pkgtools/pkg_install/files/info/info.h Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/info/info.h Mon May 30 13:23:31 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: info.h,v 1.7 2005/02/10 23:51:18 grant Exp $ */
+/* $NetBSD: info.h,v 1.8 2005/05/30 13:23:32 wiz Exp $ */
/* from FreeBSD Id: info.h,v 1.10 1997/02/22 16:09:40 peter Exp */
@@ -65,12 +65,12 @@
extern size_t termwidth;
extern lpkg_head_t pkgs;
-extern void show_file(char *, char *);
+extern void show_file(char *, char *, char *);
extern void show_var(const char *, const char *);
extern void show_plist(char *, package_t *, pl_ent_t);
extern void show_files(char *, package_t *);
extern void show_depends(char *, package_t *);
extern void show_bld_depends(char *, package_t *);
-extern void show_index(char *, char *);
+extern void show_index(char *, char *, char *);
#endif /* _INST_INFO_H_INCLUDE */
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/info/perform.c
--- a/pkgtools/pkg_install/files/info/perform.c Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/info/perform.c Mon May 30 13:23:31 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.21 2005/02/21 01:21:39 grant Exp $ */
+/* $NetBSD: perform.c,v 1.22 2005/05/30 13:23:32 wiz Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.21 2005/02/21 01:21:39 grant Exp $");
+__RCSID("$NetBSD: perform.c,v 1.22 2005/05/30 13:23:32 wiz Exp $");
#endif
#endif
@@ -186,7 +186,7 @@
char tmp[MaxPathSize];
(void) snprintf(tmp, sizeof(tmp), "%-19s ", pkg);
- show_index(tmp, COMMENT_FNAME);
+ show_index(pkg, tmp, COMMENT_FNAME);
} else if (Flags & SHOW_BI_VAR) {
show_var(BUILD_INFO_FNAME, BuildInfoVariable);
} else {
@@ -213,7 +213,7 @@
}
}
if (Flags & SHOW_COMMENT) {
- show_file("Comment:\n", COMMENT_FNAME);
+ show_file(pkg, "Comment:\n", COMMENT_FNAME);
}
if (Flags & SHOW_DEPENDS) {
show_depends("Requires:\n", &plist);
@@ -222,28 +222,28 @@
show_bld_depends("Built using:\n", &plist);
}
if ((Flags & SHOW_REQBY) && !isemptyfile(REQUIRED_BY_FNAME)) {
- show_file("Required by:\n", REQUIRED_BY_FNAME);
+ show_file(pkg, "Required by:\n", REQUIRED_BY_FNAME);
}
if (Flags & SHOW_DESC) {
- show_file("Description:\n", DESC_FNAME);
+ show_file(pkg, "Description:\n", DESC_FNAME);
}
if ((Flags & SHOW_DISPLAY) && fexists(DISPLAY_FNAME)) {
- show_file("Install notice:\n", DISPLAY_FNAME);
+ show_file(pkg, "Install notice:\n", DISPLAY_FNAME);
}
if (Flags & SHOW_PLIST) {
show_plist("Packing list:\n", &plist, PLIST_SHOW_ALL);
}
if ((Flags & SHOW_INSTALL) && fexists(INSTALL_FNAME)) {
- show_file("Install script:\n", INSTALL_FNAME);
+ show_file(pkg, "Install script:\n", INSTALL_FNAME);
}
if ((Flags & SHOW_DEINSTALL) && fexists(DEINSTALL_FNAME)) {
- show_file("De-Install script:\n", DEINSTALL_FNAME);
+ show_file(pkg, "De-Install script:\n", DEINSTALL_FNAME);
}
if ((Flags & SHOW_REQUIRE) && fexists(REQUIRE_FNAME)) {
- show_file("Require script:\n", REQUIRE_FNAME);
+ show_file(pkg, "Require script:\n", REQUIRE_FNAME);
}
if ((Flags & SHOW_MTREE) && fexists(MTREE_FNAME)) {
- show_file("mtree file:\n", MTREE_FNAME);
+ show_file(pkg, "mtree file:\n", MTREE_FNAME);
}
if (Flags & SHOW_PREFIX) {
show_plist("Prefix(s):\n", &plist, PLIST_CWD);
@@ -252,16 +252,16 @@
show_files("Files:\n", &plist);
}
if ((Flags & SHOW_BUILD_VERSION) && fexists(BUILD_VERSION_FNAME)) {
- show_file("Build version:\n", BUILD_VERSION_FNAME);
+ show_file(pkg, "Build version:\n", BUILD_VERSION_FNAME);
}
if ((Flags & SHOW_BUILD_INFO) && fexists(BUILD_INFO_FNAME)) {
- show_file("Build information:\n", BUILD_INFO_FNAME);
+ show_file(pkg, "Build information:\n", BUILD_INFO_FNAME);
}
if ((Flags & SHOW_PKG_SIZE) && fexists(SIZE_PKG_FNAME)) {
- show_file("Size of this package in bytes: ", SIZE_PKG_FNAME);
+ show_file(pkg, "Size of this package in bytes: ", SIZE_PKG_FNAME);
}
if ((Flags & SHOW_ALL_SIZE) && fexists(SIZE_ALL_FNAME)) {
- show_file("Size in bytes including required pkgs: ", SIZE_ALL_FNAME);
+ show_file(pkg, "Size in bytes including required pkgs: ", SIZE_ALL_FNAME);
}
if (!Quiet) {
if (fexists(PRESERVE_FNAME)) {
diff -r 0d6c669879ab -r 27484862dcfd pkgtools/pkg_install/files/info/pkg_info.1
--- a/pkgtools/pkg_install/files/info/pkg_info.1 Mon May 30 12:45:38 2005 +0000
+++ b/pkgtools/pkg_install/files/info/pkg_info.1 Mon May 30 13:23:31 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_info.1,v 1.15 2005/02/10 23:51:18 grant Exp $
+.\" $NetBSD: pkg_info.1,v 1.16 2005/05/30 13:23:32 wiz Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -17,7 +17,7 @@
.\"
.\" @(#)pkg_info.1
.\"
-.Dd February 10, 2005
+.Dd May 30, 2005
.Dt PKG_INFO 1
.Os
.Sh NAME
@@ -127,6 +127,8 @@
Show the files within each package.
This is different from just viewing the packing list, since full pathnames
for everything are generated.
+Files that were created dynamically during installation of the package
+are not listed.
.It Fl l Ar str
Prefix each information category header (see
.Fl q )
@@ -152,7 +154,9 @@
An empty string is returned if no such variable definition is found for
the package(s).
.It Fl q
-Be ``quiet'' in emitting report headers and such, just dump the
+Be
+.Dq quiet
+in emitting report headers and such, just dump the
raw info (basically, assume a non-human reading).
.It Fl R
For each package, show the packages that require it.
@@ -206,18 +210,38 @@
will match versions 1.3 and later of the
.Pa name
package.
+Additionally, ranges can be defined by giving a lower bound with
+\*[Gt] or \*[Ge] and an upper bound with \*[Lt] or \*[Le].
+The lower bound has to come first.
+For example,
+.Pa pkg_info -e 'name\*[Ge]1.3\*[Lt]2.0'
+will match versions 1.3 (inclusive) to 2.0 (exclusive)
+of package
+.Pa name .
+.Pp
The collating sequence of the various package version numbers is
Home |
Main Index |
Thread Index |
Old Index