Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgtools/lintpkgsrc/Makefile
View File

@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.21 2015/07/01 19:57:31 tron Exp $
# $NetBSD: Makefile,v 1.25 2016/07/09 06:38:48 wiz Exp $
PKGNAME= lintpkgsrc-4.89
PKGNAME= lintpkgsrc-4.92
PKGREVISION= 1
CATEGORIES= pkgtools
MAINTAINER= pkgsrc-users@NetBSD.org

16
pkgtools/lintpkgsrc/files/lintpkgsrc.0
View File

@@ -4,7 +4,7 @@ NNAAMMEE
lliinnttppkkggssrrcc -- verifier for the pkgsrc tree
SSYYNNOOPPSSIISS
lliinnttppkkggssrrcc [--BBDDddLLllmmOOooppRRrrSSuuVVyyzz] [--EE _f_i_l_e] [--gg _p_k_g_s_r_c_m_a_p] [--II _f_i_l_e]
lliinnttppkkggssrrcc [--BBDDddLLllmmOOooppRRrrSSuuyyzz] [--EE _f_i_l_e] [--gg _p_k_g_s_r_c_m_a_p] [--II _f_i_l_e]
[--KK _P_A_C_K_A_G_E_S] [--MM _D_I_S_T_D_I_R] [--PP _P_K_G_S_R_C_D_I_R] [_m_a_k_e_f_i_l_e _._._.]
DDEESSCCRRIIPPTTIIOONN
@@ -41,7 +41,7 @@ DDEESSCCRRIIPPTTIIOONN
things, against the current version found in pkgsrc. This
database provides most or all of the data required for
running lliinnttppkkggssrrcc with any combination of --BB, --OO, --RR, --SS,
--VV, --dd, --gg, --ii, --pp, or --uu.
--dd, --gg, --ii, --pp, or --uu.
--ii Check the version of each installed package against the
current version in pkgsrc.
@@ -50,7 +50,7 @@ DDEESSCCRRIIPPTTIIOONN
_/_e_t_c_/_m_k_._c_o_n_f or defaulted to _$_{_P_K_G_S_R_C_D_I_R_}_/_p_a_c_k_a_g_e_s.
Note: lintpkgsrc treats _P_A_C_K_A_G_E_S slightly differently to
the pkgsrc build system. --pp, --RR, and --VV check for binary
the pkgsrc build system. --pp and --RR check for binary
packages in any depth of PACKAGES subdirs - this allows
packages for all architectures/OS versions to be checked
simultaneously with an _/_e_t_c_/_m_k_._c_o_n_f construct of the form:
@@ -107,10 +107,6 @@ DDEESSCCRRIIPPTTIIOONN
Warning: The behaviour of this command may change in a
later version.
--VV List any prebuilt packages in any subdirs of _P_A_C_K_A_G_E_S with
known vulnerabilities, based on the data in
_$_{_P_K_G_S_R_C_D_I_R_}_/_d_i_s_t_f_i_l_e_s_/_p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s.
--yy Remove orphaned distfiles, i.e., those that do not belong
to any currently installed package.
@@ -120,9 +116,9 @@ AAUUTTHHOORRSS
David Brownlee <_a_b_s_@_n_e_t_b_s_d_._o_r_g>
BBUUGGSS
The --RR, --VV, and --pp options default to using _P_A_C_K_A_G_E_S as the base
directory from which to search for binary packages. If this includes OS
or architecture information then packages for other OS/architecture
The --RR and --pp options default to using _P_A_C_K_A_G_E_S as the base directory
from which to search for binary packages. If this includes OS or
architecture information then packages for other OS/architecture
combinations will be missed. In this case _P_A_C_K_A_G_E_S can be overridden
with --KK or set conditionally in _/_e_t_c_/_m_k_._c_o_n_f based on the value of
_L_I_N_T_P_K_G_S_R_C.

20
pkgtools/lintpkgsrc/files/lintpkgsrc.1
View File

@@ -1,16 +1,16 @@
.\" $NetBSD: lintpkgsrc.1,v 1.4 2014/11/24 09:50:34 wiz Exp $
.\" $NetBSD: lintpkgsrc.1,v 1.5 2016/03/12 09:05:22 wiz Exp $
.\"
.\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org)
.\" Absolutely no warranty.
.\"
.Dd November 24, 2014
.Dd March 12, 2016
.Dt LINTPKGSRC 1
.Sh NAME
.Nm lintpkgsrc
.Nd verifier for the pkgsrc tree
.Sh SYNOPSIS
.Nm
.Op Fl BDdLlmOopRrSuVyz
.Op Fl BDdLlmOopRrSuyz
.Op Fl E Ar file
.Op Fl g Ar pkgsrcmap
.Op Fl I Ar file
@@ -62,7 +62,6 @@ with any combination of
.Fl O ,
.Fl R ,
.Fl S ,
.Fl V ,
.Fl d ,
.Fl g ,
.Fl i ,
@@ -81,10 +80,9 @@ or defaulted to
Note: lintpkgsrc treats
.Em PACKAGES
slightly differently to the pkgsrc build system.
.Fl p ,
.Fl R ,
.Fl p
and
.Fl V
.Fl R
check for
binary packages in any depth of PACKAGES subdirs - this allows packages for all
architectures/OS versions to be checked simultaneously with an
@@ -157,11 +155,6 @@ to ensure all the distfiles needed for
the latest version are present.
.Pp
Warning: The behaviour of this command may change in a later version.
.It Fl V
List any prebuilt packages in any subdirs of
.Em PACKAGES
with known vulnerabilities, based on the data in
.Pa ${PKGSRCDIR}/distfiles/pkg-vulnerabilities .
.It Fl y
Remove orphaned distfiles, i.e., those that do not belong to any
currently installed package.
@@ -172,8 +165,7 @@ Remove distfiles for currently installed packages.
.An David Brownlee Aq Mt abs@netbsd.org
.Sh BUGS
The
.Fl R ,
.Fl V ,
.Fl R
and
.Fl p
options default to using

56
pkgtools/lintpkgsrc/files/lintpkgsrc.pl
View File

@@ -1,6 +1,6 @@
#! @PERL@
# $NetBSD: lintpkgsrc.pl,v 1.6 2015/07/01 19:57:31 tron Exp $
# $NetBSD: lintpkgsrc.pl,v 1.11 2016/03/12 09:06:29 wiz Exp $
# Written by David Brownlee <abs@netbsd.org>.
#
@@ -32,7 +32,6 @@ my (
$pkg_installver, # installed version of pkg_install pseudo-pkg
$default_vars, # Set for Makefiles, inc PACKAGES & PKGSRCDIR
%opt, # Command line options
%vuln, # vulnerability data
@matched_prebuiltpackages, # List of obsolete prebuilt package paths
@prebuilt_pkgdirs, # Use to follow symlinks in prebuilt pkgdirs
%prebuilt_pkgdir_cache, # To avoid symlink loops in prebuilt_pkgdirs
@@ -58,7 +57,6 @@ if (
|| defined $opt{R}
|| defined $opt{O}
|| defined $opt{S}
|| defined $opt{V}
|| defined $opt{E}
|| defined $opt{y}
|| defined $opt{z}
@@ -154,7 +152,7 @@ sub main() {
if (m/^(\w+) ?\(([^\)]+)\) = (\S+)/)
{
my($dn);
if ($2 =~ /^patch-[a-z0-9]+$/)
if ($2 =~ /^patch-[\w.+\-]+$/)
{ next; }
$dn = $2;
# Strip leading ./ which sometimes gets added
@@ -253,26 +251,9 @@ sub main() {
# List obsolete or NO_BIN_ON_FTP/RESTRICTED prebuilt packages
#
if ( $opt{p} || $opt{O} || $opt{R} || $opt{V} ) {
if ( $opt{V} ) {
my ($vuln) = "$pkgdistdir/pkg-vulnerabilities";
if ( $opt{p} || $opt{O} || $opt{R} ) {
scan_pkgsrc_makefiles($pkgsrcdir);
if ( !open( VULN, $vuln ) ) {
fail("Unable to open '$vuln': $!");
}
while (<VULN>) {
s/#.*//;
if (/([^*?[]+)(<|>|<=|>=)(\d\S+)/) {
my ( $pkg, $cmp, $ver ) = ( $1, $2, $3 );
push( @{ $vuln{$pkg} }, "$cmp $ver" );
}
}
close(VULN);
}
if ( $opt{p} || $opt{O} || $opt{R} || $opt{V} ) {
scan_pkgsrc_makefiles($pkgsrcdir);
}
@prebuilt_pkgdirs = ( $default_vars->{PACKAGES} );
%prebuilt_pkgdir_cache = ();
@@ -427,18 +408,6 @@ sub check_prebuilt_packages() {
$pkg = canonicalize_pkgname($pkg);
if ( $opt{V} && $vuln{$pkg} ) {
foreach my $chk ( @{ $vuln{$pkg} } ) {
my ( $test, $matchver ) = split( ' ', $chk );
if ( deweycmp( $ver, $test, $matchver ) ) {
print "$File::Find::dir/$_\n";
push( @matched_prebuiltpackages, "$File::Find::dir/$_" );
last;
}
}
}
my ($pkgs);
if ( $pkgs = $pkglist->pkgs($pkg) ) {
my ($pkgver) = $pkgs->pkgver($ver);
@@ -627,7 +596,7 @@ sub get_default_makefile_vars() {
$default_vars->{LOWER_OPSYS} = lc( $default_vars->{OPSYS} );
if ( $opt{P} ) {
$default_vars->{PKGSRCDIR} = $opt{P};
$default_vars->{PKGSRCDIR} = realpath($opt{P});
}
else {
$default_vars->{PKGSRCDIR} = $conf_pkgsrcdir;
@@ -646,18 +615,18 @@ sub get_default_makefile_vars() {
}
if ( $opt{P} ) {
$default_vars->{PKGSRCDIR} = $opt{P};
$default_vars->{PKGSRCDIR} = realpath($opt{P});
}
if ( $opt{M} ) {
$default_vars->{DISTDIR} = $opt{M};
$default_vars->{DISTDIR} = realpath($opt{M});
}
else {
$default_vars->{DISTDIR} ||= $default_vars->{PKGSRCDIR} . '/distfiles';
}
if ( $opt{K} ) {
$default_vars->{PACKAGES} = $opt{K};
$default_vars->{PACKAGES} = realpath($opt{K});
}
# Extract some variables from bsd.pkg.mk
@@ -1596,7 +1565,7 @@ sub scan_pkgsrc_distfiles_vs_distinfo($$$$) {
$dt = $1;
$dn = $2;
$ds = $3;
if ( $dn =~ /^patch-[\w.\-]+$/ ) {
if ( $dn =~ /^patch-[\w.+\-]+$/ ) {
next;
}
@@ -1626,12 +1595,6 @@ sub scan_pkgsrc_distfiles_vs_distinfo($$$$) {
}
verbose(" ($numpkg packages)\n");
# Do not mark the vulnerabilities file as unknown
$distfiles{'pkg-vulnerabilities'} = {
path => 'pkg-vulnerabilities',
sum => 'IGNORE'
};
# check each file in $pkgdistdir
find ( { wanted => sub {
my ($dist);
@@ -1739,7 +1702,6 @@ Prebuilt package options: Makefile options:
-p : List old/obsolete -B : List packages marked as 'BROKEN'
-O : List OSVERSION_SPECIFIC -d : Check 'DEPENDS' up to date
-R : List NO_BIN_ON_FTP/RESTRICTED -S : List packages not in 'SUBDIRS'
-V : List known vulnerabilities
Misc:
-E file : Export the internal pkgsrc database to file