Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/PKGSRC]: src/external/bsd/pkg_install/dist import pkg_install version 20...
details: https://anonhg.NetBSD.org/src/rev/4e4263ff6657
branches: PKGSRC
changeset: 947576:4e4263ff6657
user: maya <maya%NetBSD.org@localhost>
date: Fri Dec 18 17:19:16 2020 +0000
description:
import pkg_install version 20201218 from pkgsrc
- Support continuing to install to /var/db/pkg if it exists and the
new pkgdb doesn't.
In the future, we can warn about this once we have tested advice that
we can give to users who want to move the location of pkgdb.
- Don't do anything about /var/db/pkg on non-NetBSD-base.
This creates conflicts with other package managers that also install to
/var/db/pkg.
diffstat:
external/bsd/pkg_install/dist/add/Makefile.in | 4 +-
external/bsd/pkg_install/dist/add/pkg_add.cat | 34 ++++----
external/bsd/pkg_install/dist/admin/pkg_admin.cat | 31 ++++---
external/bsd/pkg_install/dist/configure | 22 ++--
external/bsd/pkg_install/dist/configure.ac | 8 +-
external/bsd/pkg_install/dist/create/Makefile.in | 4 +-
external/bsd/pkg_install/dist/create/pkg_create.cat | 7 +-
external/bsd/pkg_install/dist/delete/pkg_delete.cat | 6 +-
external/bsd/pkg_install/dist/diff | 2 +
external/bsd/pkg_install/dist/info/pkg_info.cat | 56 +++++++-------
external/bsd/pkg_install/dist/lib/Makefile.in | 3 +-
external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in | 7 +-
external/bsd/pkg_install/dist/lib/pkg_summary.cat | 2 +-
external/bsd/pkg_install/dist/lib/pkgdb.c | 34 ++++++--
external/bsd/pkg_install/dist/lib/pkgsrc.cat | 2 +-
external/bsd/pkg_install/dist/lib/plist.c | 23 +++--
external/bsd/pkg_install/dist/lib/version.h | 4 +-
17 files changed, 136 insertions(+), 113 deletions(-)
diffs (truncated from 670 to 300 lines):
diff -r 0be06603160a -r 4e4263ff6657 external/bsd/pkg_install/dist/add/Makefile.in
--- a/external/bsd/pkg_install/dist/add/Makefile.in Sat Dec 12 10:59:12 2020 +0000
+++ b/external/bsd/pkg_install/dist/add/Makefile.in Fri Dec 18 17:19:16 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.1.1.1 2018/02/04 08:20:42 maya Exp $
+# $NetBSD: Makefile.in,v 1.1.1.2 2020/12/18 17:19:16 maya Exp $
srcdir= @srcdir@
@@ -29,7 +29,7 @@
.endif
LIBS+= @LIBS@
.else
-LIBS= -linstall ${STATIC_LIBARCHIVE} @LIBS@
+LIBS= -linstall ${STATIC_LIBARCHIVE} ${STATIC_LIBARCHIVE_LDADD} @LIBS@
CPPFLAGS+= -DBOOTSTRAP
.endif
diff -r 0be06603160a -r 4e4263ff6657 external/bsd/pkg_install/dist/add/pkg_add.cat
--- a/external/bsd/pkg_install/dist/add/pkg_add.cat Sat Dec 12 10:59:12 2020 +0000
+++ b/external/bsd/pkg_install/dist/add/pkg_add.cat Fri Dec 18 17:19:16 2020 +0000
@@ -1,12 +1,12 @@
PKG_ADD(1) General Commands Manual PKG_ADD(1)
NNAAMMEE
- ppkkgg__aadddd -- a utility for installing and upgrading software package
+ ppkkgg__aadddd - a utility for installing and upgrading software package
distributions
SSYYNNOOPPSSIISS
- ppkkgg__aadddd [--AAffIInnRRUUuuVVvv] [--CC _c_o_n_f_i_g] [--KK _p_k_g___d_b_d_i_r] [--mm _m_a_c_h_i_n_e] [--PP _d_e_s_t_d_i_r]
- [--pp _p_r_e_f_i_x]
+ ppkkgg__aadddd [--AAffhhIInnRRUUuuVVvv] [--CC _c_o_n_f_i_g] [--KK _p_k_g___d_b_d_i_r] [--mm _m_a_c_h_i_n_e]
+ [--PP _d_e_s_t_d_i_r] [--pp _p_r_e_f_i_x]
_f_i_l_e _._._. [[ftp|http]://[_u_s_e_r][:_p_a_s_s_w_o_r_d]@]_h_o_s_t[:_p_o_r_t][/_p_a_t_h_/]_p_k_g_-_n_a_m_e _._._.
DDEESSCCRRIIPPTTIIOONN
@@ -19,9 +19,9 @@
WWAARRNNIINNGG
_S_i_n_c_e _t_h_e ppkkgg__aadddd _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d
- _w_i_t_h_i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n
- _h_o_r_s_e_s_'_' _o_r _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s
- _p_a_c_k_a_g_e _f_i_l_e_s_.
+ _w_i_t_h_i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _"_T_r_o_j_a_n _h_o_r_s_e_s_"
+ _o_r _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e
+ _f_i_l_e_s_.
_Y_o_u _a_r_e _a_d_v_i_s_e_d _t_o _v_e_r_i_f_y _t_h_e _c_o_m_p_e_t_e_n_c_e _a_n_d _i_d_e_n_t_i_t_y _o_f _t_h_o_s_e _w_h_o
_p_r_o_v_i_d_e _i_n_s_t_a_l_l_a_b_l_e _p_a_c_k_a_g_e _f_i_l_e_s_. _F_o_r _e_x_t_r_a _p_r_o_t_e_c_t_i_o_n_, _u_s_e _t_h_e
_d_i_g_i_t_a_l
@@ -57,6 +57,11 @@
Read the configuration file from _c_o_n_f_i_g instead of the system
default.
+ --DD Force updating even if the dependencies of depending packages are
+ not satisfied by the new package. This is used by "make
+ replace", after which one would typically replace the depending
+ packages.
+
--ff Force installation to proceed even if prerequisite packages are
not installed or the install script fails. Although ppkkgg__aadddd will
still try to find and auto-install missing prerequisite packages,
@@ -65,10 +70,7 @@
architecture the package was built on differ from that of the
host.
- --DD Force updating even if the dependencies of depending packages are
- not satisfied by the new package. This is used by "make
- replace", after which one would typically replace the depending
- packages.
+ --hh Display help and exit.
--II If an installation script exists for a given package, do not
execute it.
@@ -107,8 +109,8 @@
--vv Turn on verbose output.
One or more _p_k_g_-_n_a_m_e arguments may be specified, each being either a file
- containing the package (these usually ending with the ``.tgz'' suffix) or
- a URL pointing at a file available on an ftp or web site. Thus you may
+ containing the package (these usually ending with the ".tgz" suffix) or a
+ URL pointing at a file available on an ftp or web site. Thus you may
extract files directly from their anonymous ftp or WWW locations (e.g.,
ppkkgg__aadddd
ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/shells/bash-3.2.9.tgz
@@ -121,9 +123,9 @@
ftp.
TTEECCHHNNIICCAALL DDEETTAAIILLSS
- ppkkgg__aadddd extracts each package's meta data (including the ``packing
- list'') to memory and then runs through the following sequence to fully
- extract the contents of the package:
+ ppkkgg__aadddd extracts each package's meta data (including the "packing list")
+ to memory and then runs through the following sequence to fully extract
+ the contents of the package:
1. A check is made to determine if the package or another version
of it is already recorded as installed. If it is,
@@ -262,4 +264,4 @@
Sure to be others.
-pkgsrc December 27, 2014 pkgsrc
+pkgsrc March 21, 2018 pkgsrc
diff -r 0be06603160a -r 4e4263ff6657 external/bsd/pkg_install/dist/admin/pkg_admin.cat
--- a/external/bsd/pkg_install/dist/admin/pkg_admin.cat Sat Dec 12 10:59:12 2020 +0000
+++ b/external/bsd/pkg_install/dist/admin/pkg_admin.cat Fri Dec 18 17:19:16 2020 +0000
@@ -1,7 +1,7 @@
PKG_ADMIN(1) 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 [--bbqqSSVVvv] [--CC _c_o_n_f_i_g] [--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]
@@ -47,18 +47,20 @@
The following commands are supported:
- aauuddiitt [--eess] [--tt _t_y_p_e] [_p_k_g] ...
+ aauuddiitt [--eeiiss] [--tt _t_y_p_e] [_p_k_g] ...
Check the listed installed packages for vulnerabilities. If no
package is given, check all installed packages. If --ee is given,
override the CHECK_END_OF_LIFE option from pkg_install.conf(5)
- with "yes". If --ss is given, check the signature of the pkg-
- vulnerabilities file before using it. --tt restricts the reported
- vulnerabilities to type _t_y_p_e.
+ with "yes". If --ii is given, any advisory ignored by IGNORE_URL
+ in pkg_install.conf(5) is included but flagged as "ignored". If
+ --ss is given, check the signature of the pkg-vulnerabilities file
+ before using it. --tt restricts the reported vulnerabilities to
+ type _t_y_p_e.
- aauuddiitt--ppkkgg [--eess] [--tt _t_y_p_e] [_p_k_g] ...
+ aauuddiitt--ppkkgg [--eeiiss] [--tt _t_y_p_e] [_p_k_g] ...
Like aauuddiitt, but check only the given package names or patterns.
- aauuddiitt--bbaattcchh [--eess] [--tt _t_y_p_e] [_p_k_g_-_l_i_s_t] ...
+ aauuddiitt--bbaattcchh [--eeiiss] [--tt _t_y_p_e] [_p_k_g_-_l_i_s_t] ...
Like aauuddiitt--ppkkgg, but read the package names or patterns one per
line from the given files.
@@ -103,6 +105,9 @@
Print the current value of _v_a_r_i_a_b_l_e as used after parsing the
configuration file.
+ ddiiggeesstt _f_i_l_e _._._.
+ Compute a SHA256 message digest of _f_i_l_e.
+
dduummpp Dump the contents of the package database, similar to ppkkgg__iinnffoo
--FF. Columns are printed for the key field used in the pkgdb -
the filename -, and the data field - the package the file belongs
@@ -121,6 +126,10 @@
pattern. If a pattern is not matched, it is skipped and the
command will return a failure.
+ ggppgg--ssiiggnn--ppaacckkaaggee ppkkgg ssppkkgg
+ Sign the binary package _p_k_g using GPG and write the result to
+ _s_p_k_g.
+
llssaallll _/_d_i_r_/_p_k_g_p_a_t_t_e_r_n
llssbbeesstt _/_d_i_r_/_p_k_g_p_a_t_t_e_r_n
@@ -173,11 +182,7 @@
uunnsseett to remove a variable.
Packages that are not installed directly by the user but pulled
- in as dependencies are marked by setting ``automatic=YES''.
-
- ggppgg--ssiiggnn--ppaacckkaaggee ppkkgg ssppkkgg
- Sign the binary package _p_k_g using GPG and write the result to
- _s_p_k_g.
+ in as dependencies are marked by setting "automatic=YES".
xx550099--ssiiggnn--ppaacckkaaggee ppkkgg ssppkkgg kkeeyy cceerrtt
Sign the binary package _p_k_g using the key _k_e_y and the certificate
@@ -204,4 +209,4 @@
AAUUTTHHOORRSS
The ppkkgg__aaddmmiinn command was written by Hubert Feyrer.
-pkgsrc December 27, 2014 pkgsrc
+pkgsrc October 8, 2019 pkgsrc
diff -r 0be06603160a -r 4e4263ff6657 external/bsd/pkg_install/dist/configure
--- a/external/bsd/pkg_install/dist/configure Sat Dec 12 10:59:12 2020 +0000
+++ b/external/bsd/pkg_install/dist/configure Fri Dec 18 17:19:16 2020 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pkg_install 20090911.
+# Generated by GNU Autoconf 2.69 for pkg_install 20200701.
#
# Report bugs to <joerg%NetBSD.org@localhost>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='pkg_install'
PACKAGE_TARNAME='pkg_install'
-PACKAGE_VERSION='20090911'
-PACKAGE_STRING='pkg_install 20090911'
+PACKAGE_VERSION='20200701'
+PACKAGE_STRING='pkg_install 20200701'
PACKAGE_BUGREPORT='joerg%NetBSD.org@localhost'
PACKAGE_URL=''
@@ -1265,7 +1265,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pkg_install 20090911 to adapt to many kinds of systems.
+\`configure' configures pkg_install 20200701 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1330,7 +1330,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pkg_install 20090911:";;
+ short | recursive ) echo "Configuration of pkg_install 20200701:";;
esac
cat <<\_ACEOF
@@ -1344,7 +1344,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-pkgdbdir=DIR Where to put the pkg database (/var/db/pkg)
+ --with-pkgdbdir=DIR Where to put the pkg database (PREFIX/pkgdb)
--with-ssl Enable OpenSSL based signature support
Some influential environment variables:
@@ -1423,7 +1423,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pkg_install configure 20090911
+pkg_install configure 20200701
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1983,7 +1983,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pkg_install $as_me 20090911, which was
+It was created by pkg_install $as_me 20200701, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4025,7 +4025,7 @@
if test "${with_pkgdbdir+set}" = set; then :
withval=$with_pkgdbdir; pkgdbdir="$with_pkgdbdir"
else
- pkgdbdir="/var/db/pkg"
+ pkgdbdir="${prefix}/pkgdb"
fi
@@ -5789,7 +5789,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pkg_install $as_me 20090911, which was
+This file was extended by pkg_install $as_me 20200701, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5851,7 +5851,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pkg_install config.status 20090911
+pkg_install config.status 20200701
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r 0be06603160a -r 4e4263ff6657 external/bsd/pkg_install/dist/configure.ac
--- a/external/bsd/pkg_install/dist/configure.ac Sat Dec 12 10:59:12 2020 +0000
+++ b/external/bsd/pkg_install/dist/configure.ac Fri Dec 18 17:19:16 2020 +0000
@@ -1,7 +1,7 @@
-dnl $NetBSD: configure.ac,v 1.1.1.1 2018/02/04 08:20:42 maya Exp $
+dnl $NetBSD: configure.ac,v 1.1.1.2 2020/12/18 17:19:16 maya Exp $
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([pkg_install], [20090911], [joerg%NetBSD.org@localhost])
+AC_INIT([pkg_install], [20200701], [joerg%NetBSD.org@localhost])
AC_CONFIG_SRCDIR([lib/plist.c])
AC_CONFIG_HEADER(lib/config.h)
@@ -39,9 +39,9 @@
dnl Set the default pkg dbdir
AC_ARG_WITH(pkgdbdir,
-[ --with-pkgdbdir=DIR Where to put the pkg database (/var/db/pkg)],
+[ --with-pkgdbdir=DIR Where to put the pkg database (PREFIX/pkgdb)],
[ pkgdbdir="$with_pkgdbdir" ],
-[ pkgdbdir="/var/db/pkg" ])
+[ pkgdbdir="${prefix}/pkgdb" ])
AC_SUBST(pkgdbdir)
Home |
Main Index |
Thread Index |
Old Index