Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/pkg_install/dist Merge pkg_install-20201218



details:   https://anonhg.NetBSD.org/src/rev/d0cdadc6d69d
branches:  trunk
changeset: 1017208:d0cdadc6d69d
user:      maya <maya%NetBSD.org@localhost>
date:      Fri Dec 18 20:07:39 2020 +0000

description:
Merge pkg_install-20201218

diffstat:

 external/bsd/pkg_install/dist/Makefile.in                           |    24 -
 external/bsd/pkg_install/dist/README                                |    21 -
 external/bsd/pkg_install/dist/add/Makefile.in                       |    65 -
 external/bsd/pkg_install/dist/add/pkg_add.cat                       |   267 -
 external/bsd/pkg_install/dist/admin/Makefile.in                     |    86 -
 external/bsd/pkg_install/dist/admin/audit-packages.cat              |    22 -
 external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat |    20 -
 external/bsd/pkg_install/dist/admin/pkg_admin.cat                   |   212 -
 external/bsd/pkg_install/dist/config.guess                          |  1502 --
 external/bsd/pkg_install/dist/config.sub                            |  1708 --
 external/bsd/pkg_install/dist/configure                             |  6571 ----------
 external/bsd/pkg_install/dist/configure.ac                          |   178 -
 external/bsd/pkg_install/dist/create/Makefile.in                    |    63 -
 external/bsd/pkg_install/dist/create/pkg_create.cat                 |   279 -
 external/bsd/pkg_install/dist/delete/Makefile.in                    |    58 -
 external/bsd/pkg_install/dist/delete/pkg_delete.cat                 |   163 -
 external/bsd/pkg_install/dist/diff                                  |     2 -
 external/bsd/pkg_install/dist/info/Makefile.in                      |    63 -
 external/bsd/pkg_install/dist/info/pkg_info.cat                     |   202 -
 external/bsd/pkg_install/dist/install-sh                            |   238 -
 external/bsd/pkg_install/dist/lib/Makefile.in                       |    78 -
 external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in           |   183 -
 external/bsd/pkg_install/dist/lib/pkg_summary.cat                   |   117 -
 external/bsd/pkg_install/dist/lib/pkgsrc.cat                        |    19 -
 external/bsd/pkg_install/dist/tkpkg                                 |   152 -
 25 files changed, 0 insertions(+), 12293 deletions(-)

diffs (truncated from 12393 to 300 lines):

diff -r 8301b3a35a0e -r d0cdadc6d69d external/bsd/pkg_install/dist/Makefile.in
--- a/external/bsd/pkg_install/dist/Makefile.in Fri Dec 18 19:02:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile.in,v 1.3 2020/12/18 17:32:41 maya Exp $
-
-BOOTSTRAP=     @bootstrap@
-
-.if empty(BOOTSTRAP)
-SUBDIRS=       lib add admin create delete info
-.else
-SUBDIRS=       lib add admin create info
-.endif
-
-all:
-       @for dir in $(SUBDIRS); do \
-               ( cd $$dir && $(MAKE) $@ ) || exit 1; \
-       done
-
-install clean:
-       @for dir in $(SUBDIRS); do \
-               ( cd $$dir && $(MAKE) $@ ) || exit 1; \
-       done
-
-distclean: clean
-       rm -f config.log config.status configure.lineno
-       rm -f Makefile */Makefile
-       rm -f lib/config.h lib/pkg_install.conf.5 lib/pkg_install.conf.cat
diff -r 8301b3a35a0e -r d0cdadc6d69d external/bsd/pkg_install/dist/README
--- a/external/bsd/pkg_install/dist/README      Fri Dec 18 19:02:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: README,v 1.3 2020/12/18 17:32:41 maya Exp $
-# Original from FreeBSD, no rcs id.
-
-This is the pkg_install suite of tools for doing maintainance of
-software "packages".  More documentation is available in the man pages
-for each individual command.
-
-This code was written by Jordan Hubbard for FreeBSD, snatched and
-mildly reshaped by John Kohl in NetBSD and the changes taken back into
-FreeBSD again by Jordan, who then proceeded to add another couple
-of dozen features on top.  Whee! :-)
-
-In another round of enhancements, NetBSD changes were added by
-Alistair Crooks, Hubert Feyrer, Thorsten Frueauf, Rene Hexel,
-Christian E. Hopps, Thomas Klausner, Johnny Lam, Matthias Scheler and
-Adrian Portelli.
-
-When making snapshots, please modify PKGTOOLS_VERSION in lib/version.h
-to that day's date.
-
-pkgsrc/pkgtools/pkg_install is the canonical location for these sources.
diff -r 8301b3a35a0e -r d0cdadc6d69d external/bsd/pkg_install/dist/add/Makefile.in
--- a/external/bsd/pkg_install/dist/add/Makefile.in     Fri Dec 18 19:02:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-# $NetBSD: Makefile.in,v 1.3 2020/12/18 17:32:41 maya Exp $
-
-srcdir=                @srcdir@
-
-prefix=                @prefix@
-exec_prefix=   @exec_prefix@
-sbindir=       @sbindir@
-mandir=                @mandir@
-datarootdir=   @datarootdir@
-
-man1dir=       $(mandir)/man1
-cat1dir=       $(mandir)/cat1
-
-CC=            @CC@
-CCLD=          $(CC)
-CPPFLAGS=      @CPPFLAGS@ -I. -I$(srcdir) -I../lib
-DEFS=          @DEFS@ -DOPSYS_NAME=\"$(OPSYS)\" -DPKGSRC_MACHINE_ARCH=\"$(PKGSRC_MACHINE_ARCH)\" -DBINDIR=\"$(sbindir)\"
-CFLAGS=                @CFLAGS@
-LDFLAGS=       @LDFLAGS@ -L../lib
-
-BOOTSTRAP=     @bootstrap@
-SSL_SUPPORT=   @ssl_support@
-
-.if empty(BOOTSTRAP)
-LIBS=          -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch
-.if !empty(SSL_SUPPORT)
-LIBS+=         -lssl -lcrypto
-CPPFLAGS+=     -DHAVE_SSL
-.endif
-LIBS+=         @LIBS@
-.else
-LIBS=          -linstall ${STATIC_LIBARCHIVE} ${STATIC_LIBARCHIVE_LDADD} @LIBS@
-CPPFLAGS+=     -DBOOTSTRAP
-.endif
-
-INSTALL=       @INSTALL@
-
-PROG=          pkg_add
-
-OBJS=  main.o perform.o
-
-all: $(PROG)
-
-.c.o:
-       $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(PROG): $(OBJS)
-       $(CCLD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-clean:
-       rm -f $(OBJS) $(PROG)
-
-install:
-       $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir)
-       $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
-       $(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG)
-       $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
-.if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
-       $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
-.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
-       $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1
-.  else
-       $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
-.  endif
-.endif
diff -r 8301b3a35a0e -r d0cdadc6d69d external/bsd/pkg_install/dist/add/pkg_add.cat
--- a/external/bsd/pkg_install/dist/add/pkg_add.cat     Fri Dec 18 19:02:37 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,267 +0,0 @@
-PKG_ADD(1)                  General Commands Manual                 PKG_ADD(1)
-
-NNAAMMEE
-     ppkkgg__aadddd - a utility for installing and upgrading software package
-     distributions
-
-SSYYNNOOPPSSIISS
-     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
-     The ppkkgg__aadddd command is used to extract and upgrade packages that have
-     been previously created with the pkg_create(1) command.  Packages are
-     prepared collections of pre-built binaries, documentation,
-     configurations, installation instructions and/or other files.  ppkkgg__aadddd
-     can recursively install other packages that the current package depends
-     on or requires from both local disk and via FTP or HTTP.
-
-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_.
-
-     _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
-     _s_i_g_n_a_t_u_r_e_s _p_r_o_v_i_d_e_d _w_h_e_r_e _p_o_s_s_i_b_l_e _(_s_e_e _t_h_e _p_k_g___i_n_s_t_a_l_l_._c_o_n_f_(_5_)_)_, _o_r_,
-     _f_a_i_l_i_n_g _t_h_a_t_, _u_s_e _t_a_r_(_1_) _t_o _e_x_t_r_a_c_t _t_h_e _p_a_c_k_a_g_e _f_i_l_e_, _a_n_d _i_n_s_p_e_c_t _i_t_s
-     _c_o_n_t_e_n_t_s _a_n_d _s_c_r_i_p_t_s _t_o _e_n_s_u_r_e _i_t _p_o_s_e_s _n_o _d_a_n_g_e_r _t_o _y_o_u_r _s_y_s_t_e_m_'_s
-     _i_n_t_e_g_r_i_t_y_.  _P_a_y _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y _+_I_N_S_T_A_L_L _o_r _+_D_E_I_N_S_T_A_L_L 
_f_i_l_e_s_,
-     _a_n_d _i_n_s_p_e_c_t _t_h_e _+_C_O_N_T_E_N_T_S _f_i_l_e _f_o_r @@ccwwdd_, @@mmooddee _(_c_h_e_c_k _f_o_r _s_e_t_u_i_d_)_,
-     @@ddiirrrrmm_, @@eexxeecc_, _a_n_d @@uunneexxeecc _d_i_r_e_c_t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e _p_k_g___i_n_f_o_(_1_) 
_c_o_m_m_a_n_d
-     _t_o _e_x_a_m_i_n_e _t_h_e _p_a_c_k_a_g_e _f_i_l_e_.
-
-OOPPTTIIOONNSS
-     The following command line arguments are supported:
-
-     _p_k_g_-_n_a_m_e [_._._.]
-             The named packages are installed.  ppkkgg__aadddd will first try to use
-             _p_k_g_-_n_a_m_e as full URL or path name without any wildcard
-             processing.  If that fails, ppkkgg__aadddd will try to match packages
-             using wildcard processing.  If that fails as well and _p_k_g_-_n_a_m_e
-             does not contain any /, the entries of the PKG_PATH variable are
-             searched using the wildcard processing rules.
-
-     --AA      Mark package as installed automatically, as dependency of another
-             package.  You can use
-                   ppkkgg__aaddmmiinn sseett aauuttoommaattiicc==YYEESS
-             to mark packages this way after installation, and
-                   ppkkgg__aaddmmiinn uunnsseett aauuttoommaattiicc
-             to remove the mark.  If you ppkkgg__aadddd a package without specifying
-             --AA after it had already been automatically installed, the mark is
-             removed.
-
-     --CC _c_o_n_f_i_g
-             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,
-             a failure to find one will not be fatal.  This flag also
-             overrides the fatal error when the operating system or
-             architecture the package was built on differ from that of the
-             host.
-
-     --hh      Display help and exit.
-
-     --II      If an installation script exists for a given package, do not
-             execute it.
-
-     --KK _p_k_g___d_b_d_i_r
-             Override the value of the PKG_DBDIR configuration option with the
-             value _p_k_g___d_b_d_i_r.
-
-     --mm      Override the machine architecture returned by uname with _m_a_c_h_i_n_e.
-
-     --nn      Don't actually install a package, just report the steps that
-             would be taken if it was.
-
-     --PP _d_e_s_t_d_i_r
-             Prefix all file and directory names with _d_e_s_t_d_i_r.  For packages
-             without install scripts this has the same behavior as using
-             chroot(8).
-
-     --pp _p_r_e_f_i_x
-             Override the prefix stored in the package with _p_r_e_f_i_x.
-
-     --RR      Do not record the installation of a package.  This implies --II.
-             This means that you cannot deinstall it later, so only use this
-             option if you know what you are doing!
-
-     --UU      Replace an already installed version from a package.  Implies --uu.
-
-     --uu      If the package that's being installed is already installed, an
-             update is performed.  Installed dependent packages are updated
-             recursively, if they are too old to fulfill the dependencies of
-             the to-be-installed version.  See below for a more detailed
-             description of the process.
-
-     --VV      Print version number and exit.
-
-     --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
-     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
-     or ppkkgg__aadddd http://www.example.org/packages/screen-4.0.tbz).  Note:  For
-     ftp transfers, if you wish to use _p_a_s_s_i_v_e _m_o_d_e ftp in such transfers, set
-     the variable _F_T_P___P_A_S_S_I_V_E___M_O_D_E to some value in your environment.
-     Otherwise, the more standard ACTIVE mode may be used.  If ppkkgg__aadddd
-     consistently fails to fetch a package from a site known to work, it may
-     be because you have a firewall that demands the usage of _p_a_s_s_i_v_e _m_o_d_e
-     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:
-
-           1.   A check is made to determine if the package or another version
-                of it is already recorded as installed.  If it is,
-                installation is terminated if the --uu or --UU options are not
-                given.
-
-                If the same version is installed and --UU is not given, it is
-                marked as manually installed and process stops.  If the --uu
-                option is given, it's assumed the package should be replaced
-                by the new version instead.  Before doing so, all packages
-                that depend on the pkg being upgraded are checked if they also
-                work with the new version.  If that test is not successful,
-                the dependent packages are updated first.  The replacing is
-                then prepared by moving an existing _+_R_E_Q_U_I_R_E_D___B_Y file aside
-                (if it exists), and running pkg_delete(1) on the installed
-                package.  Installation then proceeds as if the package was not
-                installed, and restores the _+_R_E_Q_U_I_R_E_D___B_Y file afterwards.
-
-           2.   The package build information is extracted from the
-                _+_B_U_I_L_D___I_N_F_O file and compared against the result of uname(3).
-                If the operating system or architecture of the package differ
-                from that of the host, installation is aborted.  This behavior
-                is overridable with the --ff flag.
-
-           3.   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 warning will be issued.
-
-           4.   A check is made to determine if the package conflicts (from
-                @@ppkkggccffll directives, see pkg_create(1)) with an already
-                recorded as installed package or if an installed package
-                conflicts with the package.  If it is, installation is
-                terminated.
-
-           5.   The file list of the package is compared to the file lists of
-                the installed packages.  If there is any overlap, the
-                installation is terminated.
-
-           6.   All package dependencies (from @@ppkkggddeepp directives, see
-                pkg_create(1)) are read from the packing list.  If any of
-                these required packages are not currently installed, an
-                attempt is made to find and install it; if the missing package
-                cannot be found or installed, the installation is terminated.
-
-           7.   If the package contains an _i_n_s_t_a_l_l script, it is executed with



Home | Main Index | Thread Index | Old Index