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 Merge remaining small chang...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7c34f950bc54
branches: trunk
changeset: 530957:7c34f950bc54
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Jul 16 09:57:56 2007 +0000
description:
Merge remaining small changes from NetBSD, most of all the pkgsrc.7 man
page. Fix build on !NetBSD. Rebuild man pages with nroff -mandoc on
NetBSD current for consistency. Make it DESTDIR safe. Remove the note
that src/usr.sbin/pkg_install is the authoritive version, it won't be
any longer.
diffstat:
pkgtools/pkg_install/files/README | 5 +-
pkgtools/pkg_install/files/add/Makefile.in | 14 +-
pkgtools/pkg_install/files/add/pkg_add.1 | 6 +-
pkgtools/pkg_install/files/add/pkg_add.cat1 | 12 +-
pkgtools/pkg_install/files/admin/Makefile.in | 14 +-
pkgtools/pkg_install/files/admin/pkg_admin.1 | 6 +-
pkgtools/pkg_install/files/admin/pkg_admin.cat1 | 4 +-
pkgtools/pkg_install/files/audit-packages/Makefile.in | 17 +-
pkgtools/pkg_install/files/audit-packages/audit-packages.1.in | 4 +-
pkgtools/pkg_install/files/audit-packages/audit-packages.cat1.in | 76 +++++-----
pkgtools/pkg_install/files/audit-packages/audit-packages.conf.5.in | 4 +-
pkgtools/pkg_install/files/audit-packages/audit-packages.conf.cat5.in | 4 +-
pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.1.in | 4 +-
pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.cat1.in | 76 +++++-----
pkgtools/pkg_install/files/bpm/bpm.cat1 | 4 +-
pkgtools/pkg_install/files/create/Makefile.in | 14 +-
pkgtools/pkg_install/files/create/pkg_create.cat1 | 14 +-
pkgtools/pkg_install/files/delete/Makefile.in | 14 +-
pkgtools/pkg_install/files/delete/pkg_delete.1 | 6 +-
pkgtools/pkg_install/files/delete/pkg_delete.cat1 | 4 +-
pkgtools/pkg_install/files/info/Makefile.in | 14 +-
pkgtools/pkg_install/files/info/pkg_info.1 | 6 +-
pkgtools/pkg_install/files/info/pkg_info.cat1 | 4 +-
pkgtools/pkg_install/files/lib/Makefile.in | 18 +-
pkgtools/pkg_install/files/lib/lib.h | 4 +-
pkgtools/pkg_install/files/lib/pkg_summary.cat5 | 2 +-
pkgtools/pkg_install/files/lib/pkgsrc.7 | 54 +++++++
pkgtools/pkg_install/files/lib/pkgsrc.cat7 | 19 ++
pkgtools/pkg_install/files/view/Makefile.in | 20 +-
pkgtools/pkg_install/files/view/linkfarm.cat1 | 4 +-
pkgtools/pkg_install/files/view/pkg_view.cat1 | 2 +-
31 files changed, 264 insertions(+), 185 deletions(-)
diffs (truncated from 903 to 300 lines):
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/README
--- a/pkgtools/pkg_install/files/README Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/README Mon Jul 16 09:57:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: README,v 1.8 2007/07/14 20:17:07 adrianp Exp $
+# $NetBSD: README,v 1.9 2007/07/16 09:57:56 joerg Exp $
# Original from FreeBSD, no rcs id.
This is the pkg_install suite of tools for doing maintainance of
@@ -18,5 +18,4 @@
When making snapshots, please modify PKGTOOLS_VERSION in lib/version.h
to that day's date.
-src/usr.sbin/pkg_install is the canonical location for these sources.
-Any changes should be made here first, then merged over to pkgsrc.
+pkgsrc/pkgtools/pkg_install is the canonical location for these sources.
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/add/Makefile.in
--- a/pkgtools/pkg_install/files/add/Makefile.in Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/add/Makefile.in Mon Jul 16 09:57:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.13 2005/11/22 15:44:59 ben Exp $
+# $NetBSD: Makefile.in,v 1.14 2007/07/16 09:57:56 joerg Exp $
srcdir= @srcdir@
@@ -36,9 +36,9 @@
rm -f $(OBJS) $(PROG)
install:
- $(INSTALL) -m 755 -d $(sbindir)
- $(INSTALL) -m 755 -d $(man1dir)
- $(INSTALL) -m 755 -d $(cat1dir)
- $(INSTALL) $(PROG) $(sbindir)
- $(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1
- $(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0
+ $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
+ $(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG)
+ $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
+ $(INSTALL) -m 444 $(PROG).cat1 ${DESTDIR}$(cat1dir)/$(PROG).0
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/add/pkg_add.1
--- a/pkgtools/pkg_install/files/add/pkg_add.1 Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.1 Mon Jul 16 09:57:56 2007 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.18 2006/04/08 23:06:21 wiz Exp $
+.\" $NetBSD: pkg_add.1,v 1.19 2007/07/16 09:57:56 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -17,7 +17,7 @@
.\"
.\" @(#)pkg_add.1
.\"
-.Dd April 3, 2006
+.Dd March 2, 2007
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -636,7 +636,7 @@
.Xr pkg_info 1 ,
.Xr mktemp 3 ,
.Xr sysconf 3 ,
-.Xr packages 7 ,
+.Xr pkgsrc 7 ,
.Xr mtree 8
.Sh AUTHORS
.Bl -tag -width indent -compact
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/add/pkg_add.cat1
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1 Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1 Mon Jul 16 09:57:56 2007 +0000
@@ -1,4 +1,4 @@
-PKG_ADD(1) General Commands Manual PKG_ADD(1)
+PKG_ADD(1) NetBSD General Commands Manual PKG_ADD(1)
NNAAMMEE
ppkkgg__aadddd -- a utility for installing and upgrading software package dis-
@@ -222,9 +222,9 @@
is overridable with the --ff flag.
7. The package build information from _+_B_U_I_L_D___I_N_F_O is then checked
- for USE_ABI_DEPENDS=NO (or IGNORE_RECOMMENDED). If the package
- was built with ABI dependency recommendations ignored, a warn-
- ing will be issued.
+ for USE_ABI_DEPENDS=NO (or IGNORE_RECOMMENDED). If the pack-
+ age was built with ABI dependency recommendations ignored, a
+ warning will be issued.
8. If the package contains a _r_e_q_u_i_r_e script (see pkg_create(1)),
it is executed with the following arguments:
@@ -363,7 +363,7 @@
SSEEEE AALLSSOO
pkg_admin(1), pkg_create(1), pkg_delete(1), pkg_info(1), mktemp(3),
- sysconf(3), packages(7), mtree(8)
+ sysconf(3), pkgsrc(7), mtree(8)
AAUUTTHHOORRSS
Jordan Hubbard
@@ -388,4 +388,4 @@
Sure to be others.
-pkgsrc April 3, 2006 pkgsrc
+NetBSD 4.0 March 2, 2007 NetBSD 4.0
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/admin/Makefile.in
--- a/pkgtools/pkg_install/files/admin/Makefile.in Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/admin/Makefile.in Mon Jul 16 09:57:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.10 2004/08/21 06:33:40 jlam Exp $
+# $NetBSD: Makefile.in,v 1.11 2007/07/16 09:57:57 joerg Exp $
srcdir= @srcdir@
@@ -36,9 +36,9 @@
rm -f $(OBJS) $(PROG)
install:
- $(INSTALL) -m 755 -d $(sbindir)
- $(INSTALL) -m 755 -d $(man1dir)
- $(INSTALL) -m 755 -d $(cat1dir)
- $(INSTALL) $(PROG) $(sbindir)
- $(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1
- $(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0
+ $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
+ $(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG)
+ $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
+ $(INSTALL) -m 444 $(PROG).cat1 ${DESTDIR}$(cat1dir)/$(PROG).0
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/admin/pkg_admin.1
--- a/pkgtools/pkg_install/files/admin/pkg_admin.1 Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.1 Mon Jul 16 09:57:56 2007 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_admin.1,v 1.11 2005/11/05 13:20:09 wiz Exp $
+.\" $NetBSD: pkg_admin.1,v 1.12 2007/07/16 09:57:57 joerg Exp $
.\"
.\" Copyright (c) 1999-2002 Hubert Feyrer. All rights reserved.
.\"
@@ -28,7 +28,7 @@
.\" (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 November 1, 2005
+.Dd March 2, 2007
.Dt PKG_ADMIN 1
.Os
.Sh NAME
@@ -229,7 +229,7 @@
.Xr pkg_delete 1 ,
.Xr pkg_info 1 ,
.Xr pkg_view 1 ,
-.Xr packages 7
+.Xr pkgsrc 7
.Sh HISTORY
The
.Nm
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/admin/pkg_admin.cat1
--- a/pkgtools/pkg_install/files/admin/pkg_admin.cat1 Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.cat1 Mon Jul 16 09:57:56 2007 +0000
@@ -143,7 +143,7 @@
SSEEEE AALLSSOO
pkg_add(1), pkg_create(1), pkg_delete(1), pkg_info(1), pkg_view(1),
- packages(7)
+ pkgsrc(7)
HHIISSTTOORRYY
The ppkkgg__aaddmmiinn command first appeared in NetBSD 1.4.
@@ -151,4 +151,4 @@
AAUUTTHHOORRSS
The ppkkgg__aaddmmiinn command was written by Hubert Feyrer.
-NetBSD 3.0 November 1, 2005 NetBSD 3.0
+NetBSD 4.0 March 2, 2007 NetBSD 4.0
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/audit-packages/Makefile.in
--- a/pkgtools/pkg_install/files/audit-packages/Makefile.in Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/audit-packages/Makefile.in Mon Jul 16 09:57:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.1 2007/07/14 20:17:08 adrianp Exp $
+# $NetBSD: Makefile.in,v 1.2 2007/07/16 09:57:57 joerg Exp $
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -25,7 +25,8 @@
CC = @CC@
CCLD= $(CC)
LIBS= -linstall @LIBS@
-CPPFLAGS= @CPPFLAGS@ -DHOST=\"$(CANONICAL_HOST)\" -DPKGSRC -I. -I../lib
+CPPFLAGS= @CPPFLAGS@ -I. -I../lib -DHOST=\"$(CANONICAL_HOST)\" -DPKGSRC
+CPPFLAGS+= -DPREFIX=\"$(prefix)\" -DSYSCONFDIR=\"$(sysconfdir)\"
DEFS= @DEFS@
CFLAGS= @CFLAGS@ -Wall
LDFLAGS= @LDFLAGS@ -L../lib
@@ -60,12 +61,12 @@
rm -f *.o audit-packages
install:
- $(INSTALL) -m 755 -d $(sbindir)
- $(INSTALL) -m 755 -d $(man1dir)
- $(INSTALL) -m 755 -d $(man5dir)
- $(INSTALL) -m 755 -d $(cat1dir)
- $(INSTALL) -m 755 -d $(cat5dir)
- $(INSTALL) -m 755 -d $(sharedir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(man5dir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(cat5dir)
+ $(INSTALL) -m 755 -d ${DESTDIR}$(sharedir)
$(INSTALL_PROGRAM) audit-packages $(DESTDIR)$(sbindir)/audit-packages
$(INSTALL_SCRIPT) download-vulnerability-list.sh \
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/audit-packages/audit-packages.1.in
--- a/pkgtools/pkg_install/files/audit-packages/audit-packages.1.in Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/audit-packages/audit-packages.1.in Mon Jul 16 09:57:56 2007 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: audit-packages.1.in,v 1.1 2007/07/14 20:17:08 adrianp Exp $
+.\" $NetBSD: audit-packages.1.in,v 1.2 2007/07/16 09:57:57 joerg Exp $
.\"
.\" Copyright (c) 2003 Jeremy C. Reed. All rights reserved.
.\"
@@ -317,7 +317,7 @@
.Xr pkg_info 1 ,
.Xr audit-packages.conf 5 ,
.Xr mk.conf 5 ,
-.Xr packages 7 ,
+.Xr pkgsrc 7 ,
.%T "Documentation on the NetBSD Package System"
.Sh HISTORY
The
diff -r 01a3a82ae860 -r 7c34f950bc54 pkgtools/pkg_install/files/audit-packages/audit-packages.cat1.in
--- a/pkgtools/pkg_install/files/audit-packages/audit-packages.cat1.in Mon Jul 16 09:54:55 2007 +0000
+++ b/pkgtools/pkg_install/files/audit-packages/audit-packages.cat1.in Mon Jul 16 09:57:56 2007 +0000
@@ -96,41 +96,41 @@
The type of exploit can be any text, although some common types of
exploits listed are:
- ++oo cross-site-html
- ++oo cross-site-scripting
- ++oo denial-of-service
- ++oo eol
- ++oo file-permissions
- ++oo local-access
- ++oo local-code-execution
- ++oo local-file-read
- ++oo local-file-removal
- ++oo local-file-write
- ++oo local-root-file-view
- ++oo local-root-shell
- ++oo local-symlink-race
- ++oo local-user-file-view
- ++oo local-user-shell
- ++oo privacy-leak
- ++oo remote-code-execution
- ++oo remote-command-inject
- ++oo remote-file-creation
- ++oo remote-file-read
- ++oo remote-file-view
- ++oo remote-file-write
- ++oo remote-key-theft
- ++oo remote-root-access
- ++oo remote-root-shell
- ++oo remote-script-inject
- ++oo remote-server-admin
- ++oo remote-use-of-secret
- ++oo remote-user-access
- ++oo remote-user-file-view
- ++oo remote-user-shell
- ++oo unknown
- ++oo weak-authentication
- ++oo weak-encryption
- ++oo weak-ssl-authentication
+ ·· cross-site-html
+ ·· cross-site-scripting
+ ·· denial-of-service
+ ·· eol
+ ·· file-permissions
+ ·· local-access
+ ·· local-code-execution
+ ·· local-file-read
+ ·· local-file-removal
+ ·· local-file-write
+ ·· local-root-file-view
+ ·· local-root-shell
+ ·· local-symlink-race
+ ·· local-user-file-view
+ ·· local-user-shell
+ ·· privacy-leak
+ ·· remote-code-execution
+ ·· remote-command-inject
+ ·· remote-file-creation
+ ·· remote-file-read
+ ·· remote-file-view
+ ·· remote-file-write
+ ·· remote-key-theft
+ ·· remote-root-access
+ ·· remote-root-shell
+ ·· remote-script-inject
+ ·· remote-server-admin
Home |
Main Index |
Thread Index |
Old Index