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/files/add Bring ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/73e975413f83
branches:  pkg_install-renovation
changeset: 541543:73e975413f83
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon May 19 16:25:24 2008 +0000

description:
Bring pkg_add man page somewhat in sync with reality.

diffstat:

 pkgtools/pkg_install/files/add/pkg_add.1    |  90 ++++++++++++++++------------
 pkgtools/pkg_install/files/add/pkg_add.cat1 |  89 ++++++++++++++++------------
 2 files changed, 101 insertions(+), 78 deletions(-)

diffs (truncated from 309 to 300 lines):

diff -r 4b062a4ec498 -r 73e975413f83 pkgtools/pkg_install/files/add/pkg_add.1
--- a/pkgtools/pkg_install/files/add/pkg_add.1  Mon May 19 10:42:41 2008 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.1  Mon May 19 16:25:24 2008 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.28.6.2 2008/05/11 20:20:37 joerg Exp $
+.\" $NetBSD: pkg_add.1,v 1.28.6.3 2008/05/19 16:25:24 joerg Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -58,8 +58,8 @@
 provide installable package files.
 For extra protection, use the digital signatures provided where possible
 (see the
-.Fl s
-option), or, failing that, use
+.Xr pkg_install.conf 5 ),
+or, failing that, use
 .Xr tar 1
 to extract the package file, and inspect its contents and scripts
 to ensure it poses no danger to your system's integrity.
@@ -259,13 +259,37 @@
 .Pa +REQUIRED_BY
 file afterwards.
 .It
+The package build information is extracted from the
+.Pa +BUILD_INFO
+file and compared against the result of
+.Xr 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
+.Fl f
+flag.
+.It
+The package build information from
+.Pa +BUILD_INFO
+is then checked for
+.Ev USE_ABI_DEPENDS=NO
+(or
+.Ev IGNORE_RECOMMENDED ) .
+If the package was built with ABI dependency recommendations ignored,
+a warning will be issued.
+.It
 A check is made to determine if the package conflicts (from
 .Cm @pkgcfl
 directives, see
 .Xr pkg_create 1 )
-with an already recorded as installed package.
+with an already recorded as installed package or if an installed package
+conflicts with the package.
 If it is, installation is terminated.
 .It
+The file list of the package is compared to the file lists of the
+installed packeges.
+If there is any overlap, the installation is terminated.
+.It
 All package dependencies (from
 .Cm @pkgdep
 directives, see
@@ -284,34 +308,6 @@
 .Ev PKG_PATH
 rules.
 .It
-A search is made for any
-.Cm @option
-directives which control how the package is added to the system.
-The only currently implemented option is
-.Cm @option preserve ,
-which tells pkg_add to move any existing files out of the way,
-preserving the previous contents (which are also resurrected on
-pkg_delete, so caveat emptor).
-.It
-The package build information is extracted from the
-.Pa +BUILD_INFO
-file and compared against the result of
-.Xr 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
-.Fl f
-flag.
-.It
-The package build information from
-.Pa +BUILD_INFO
-is then checked for
-.Ev USE_ABI_DEPENDS=NO
-(or
-.Ev IGNORE_RECOMMENDED ) .
-If the package was built with ABI dependency recommendations ignored,
-a warning will be issued.
-.It
 If the package contains an
 .Ar install
 script, it is executed with the following arguments:
@@ -327,8 +323,7 @@
 .Ar install
 script exits with a non-zero status code, the installation is terminated.
 .It
-It is used as a guide for moving (or copying, as necessary) files from
-the staging area into their final locations.
+The files from the file list are extracted to the choosen prefix.
 .It
 If an
 .Ar install
@@ -357,8 +352,6 @@
 .It
 If the package is a depoted package, then add it to the default view.
 .It
-The staging area is deleted and the program terminates.
-.It
 Finally, if we were upgrading a package, any
 .Pa +REQUIRED_BY
 file that was moved aside before upgrading was started is now moved
@@ -421,10 +414,6 @@
 .Dq .refcount
 appended to the path, e.g.
 .Pa /var/db/pkg.refcount .
-.It Ev PKG_TMPDIR
-Staging directory for installing packages, defaults to /var/tmp.
-Set to directory with lots of free disk if you run out of
-space when installing a binary package.
 .It Ev PKG_VIEW
 The default view can be specified in the
 .Ev PKG_VIEW
@@ -486,6 +475,25 @@
 .Pa security/audit-packages
 package and running it after every
 .Nm .
+.Sh CONFIGURATION VARIABLES
+The following variables change the behaviour of
+.Nm
+and can be found in greater detail 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 ,
@@ -507,6 +515,8 @@
 wildcard dependency processing, pkgdb, upgrading, etc.
 .It Thomas Klausner
 HTTP support.
+.It Joerg Sonnenberger
+Rewrote most of the code base to work without external commands.
 .El
 .Sh BUGS
 Hard links between files in a distribution are only preserved if either
diff -r 4b062a4ec498 -r 73e975413f83 pkgtools/pkg_install/files/add/pkg_add.cat1
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1       Mon May 19 10:42:41 2008 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1       Mon May 19 16:25:24 2008 +0000
@@ -25,13 +25,13 @@
 
      _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 --ss _o_p_t_i_o_n_)_, _o_r_, _f_a_i_l_i_n_g 
_t_h_a_t_,
-     _u_s_e tar(_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 pkg_info(_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_.
+     _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 pkg_install.conf(_5) _)_, _o_r_,
+     _f_a_i_l_i_n_g _t_h_a_t_, _u_s_e tar(_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 pkg_info(_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:
@@ -142,12 +142,28 @@
                 age was not installed, and restores the _+_R_E_Q_U_I_R_E_D___B_Y file
                 afterwards.
 
-           2.   A check is made to determine if the package conflicts (from
+           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 pack-
+                age 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.  If it is, installation is ter-
-                minated.
+                recorded as installed package or if an installed package con-
+                flicts with the package.  If it is, installation is termi-
+                nated.
 
-           3.   All package dependencies (from @@ppkkggddeepp directives, see
+           5.   The file list of the package is compared to the file lists of
+                the installed packeges.  If there is any overlap, the instal-
+                lation 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
@@ -157,24 +173,6 @@
                 considered to be too old, are also updated.  The dependant
                 packages are found according to the normal PKG_PATH rules.
 
-           4.   A search is made for any @@ooppttiioonn directives which control how
-                the package is added to the system.  The only currently imple-
-                mented option is @@ooppttiioonn pprreesseerrvvee, which tells pkg_add to move
-                any existing files out of the way, preserving the previous
-                contents (which are also resurrected on pkg_delete, so caveat
-                emptor).
-
-           5.   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.
-
-           6.   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 pack-
-                age was built with ABI dependency recommendations ignored, a
-                warning will be issued.
-
            7.   If the package contains an _i_n_s_t_a_l_l script, it is executed with
                 the following arguments:
 
@@ -187,8 +185,8 @@
                 If the _i_n_s_t_a_l_l script exits with a non-zero status code, the
                 installation is terminated.
 
-           8.   It is used as a guide for moving (or copying, as necessary)
-                files from the staging area into their final locations.
+           8.   The files from the file list are extracted to the choosen pre-
+                fix.
 
            9.   If an _i_n_s_t_a_l_l script exists for the package, it is executed
                 with the following arguments:
@@ -210,9 +208,7 @@
            11.  If the package is a depoted package, then add it to the
                 default view.
 
-           12.  The staging area is deleted and the program terminates.
-
-           13.  Finally, if we were upgrading a package, any _+_R_E_Q_U_I_R_E_D___B_Y file
+           12.  Finally, if we were upgrading a package, any _+_R_E_Q_U_I_R_E_D___B_Y file
                 that was moved aside before upgrading was started is now moved
                 back into place.
 
@@ -248,10 +244,6 @@
                  directory with ``.refcount'' appended to the path, e.g.
                  _/_v_a_r_/_d_b_/_p_k_g_._r_e_f_c_o_u_n_t.
 
-     PKG_TMPDIR  Staging directory for installing packages, defaults to
-                 /var/tmp.  Set to directory with lots of free disk if you run
-                 out of space when installing a binary package.
-
      PKG_VIEW    The default view can be specified in the PKG_VIEW environment
                  variable.
 
@@ -287,6 +279,25 @@
      ter.)  If you do this, consider installing and using the
      _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.
+
+     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.
+
 SSEEEE AALLSSOO
      pkg_admin(1), pkg_create(1), pkg_delete(1), pkg_info(1), tar(1),
      mktemp(3), sysconf(3), pkgsrc(7)



Home | Main Index | Thread Index | Old Index